From 7fdf1e42e9a3edaee8437c9b4d0a4d65fc2b6095 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 14 Mar 2025 20:05:30 -0400 Subject: [PATCH 1/7] Added stage to create tags --- .gitlab-ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9269c22..10942df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,27 @@ test_variable: rules: - if: '$CI_COMMIT_TAG' +extract_version: + stage: version + image: alpine:latest + script: + - apk add --no-cache jq + - VERSION=$(jq -r '.package.version' Cargo.toml) + - echo "Version: $VERSION" + - echo "VERSION=$VERSION" > version.env + artifacts: + reports: + dotenv: version.env +tag_release: + stage: deploy + image: registry.gitlab.com/gitlab-org/release-cli:latest + rules: + - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"' + dependencies: + - extract_version + script: + - release-cli create --name "Release $VERSION" --tag-name "v$VERSION" + deploy: stage: deploy image: rust:1.85 From 554670d7053ac19169453f5199c531427b80d773 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 14 Mar 2025 20:09:48 -0400 Subject: [PATCH 2/7] Saving change --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10942df..207d695 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build - test + - version - deploy build: @@ -51,6 +52,7 @@ extract_version: artifacts: reports: dotenv: version.env + tag_release: stage: deploy image: registry.gitlab.com/gitlab-org/release-cli:latest From 81d4f5a2cf86d46e19afc85a1797e8004a5ea356 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 14 Mar 2025 20:11:53 -0400 Subject: [PATCH 3/7] Making ci/cd changes --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 207d695..376e966 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,8 @@ extract_version: script: - apk add --no-cache jq - VERSION=$(jq -r '.package.version' Cargo.toml) - - echo "Version: $VERSION" + - if [ $? -ne 0 ]; then echo "Error extracting version"; exit 1; fi + - echo "Extracted version: $VERSION" - echo "VERSION=$VERSION" > version.env artifacts: reports: @@ -61,7 +62,7 @@ tag_release: dependencies: - extract_version script: - - release-cli create --name "Release $VERSION" --tag-name "v$VERSION" + - release-cli create --name "Release v$VERSION" --tag-name "v$VERSION" deploy: stage: deploy From be2025cc0f7c07668425f8b2f20937a874d4b53c Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 14 Mar 2025 20:16:03 -0400 Subject: [PATCH 4/7] Here we go --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 376e966..d19f16b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,3 +77,4 @@ deploy: - build rules: - if: '$CI_COMMIT_TAG' + From 7bde1f3918583e27ea424e5539d437db9622a632 Mon Sep 17 00:00:00 2001 From: KD Date: Sat, 15 Mar 2025 00:18:07 +0000 Subject: [PATCH 5/7] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d19f16b..25f84fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,8 @@ extract_version: - apk add --no-cache jq - VERSION=$(jq -r '.package.version' Cargo.toml) - if [ $? -ne 0 ]; then echo "Error extracting version"; exit 1; fi - - echo "Extracted version: $VERSION" + - echo "Extracted version is" + - echo "$VERSION" - echo "VERSION=$VERSION" > version.env artifacts: reports: From 2050a9be0efb1230388b13cf3276c25f5378f4b0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 14 Mar 2025 20:28:51 -0400 Subject: [PATCH 6/7] Switch up --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b061e8f..cf7fc91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "icarus-models" -description = "models used for the icarus project" -license = "MIT" version = "0.1.7" edition = "2024" +description = "models used for the icarus project" +license = "MIT" [dependencies] serde = { version = "1.0.218", features = ["derive"] } From 38a5a95bfd4ef1b91bc58a816f44c9f4c8b96f06 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 14 Mar 2025 20:37:59 -0400 Subject: [PATCH 7/7] Here we go again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d19f16b..2c782aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ extract_version: image: alpine:latest script: - apk add --no-cache jq - - VERSION=$(jq -r '.package.version' Cargo.toml) + - VERSION=$(grep 'version = "' Cargo.toml | awk -F'"' '{print $2}' | head -n 1) - if [ $? -ne 0 ]; then echo "Error extracting version"; exit 1; fi - echo "Extracted version: $VERSION" - echo "VERSION=$VERSION" > version.env