From 785eb16e4ce2ba0ce7c6d7649619162567c3ccf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <git@minelli.me>
Date: Tue, 5 Mar 2024 18:54:02 +0100
Subject: [PATCH] CI/CD => Transform rules to be more readable
---
NodeApp/.gitlab-ci/02_templates.yml | 4 ++--
NodeApp/.gitlab-ci/06_stageBuild.yml | 3 ++-
NodeApp/.gitlab-ci/07_stagePkgAndSign.yml | 4 ++--
NodeApp/.gitlab-ci/08_stageClean.yml | 14 ++++++++------
NodeApp/.gitlab-ci/09_stageUpload.yml | 4 ++--
NodeApp/.gitlab-ci/10_stageRelease.yml | 10 ++++++----
6 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/NodeApp/.gitlab-ci/02_templates.yml b/NodeApp/.gitlab-ci/02_templates.yml
index 41ca52f..828f273 100644
--- a/NodeApp/.gitlab-ci/02_templates.yml
+++ b/NodeApp/.gitlab-ci/02_templates.yml
@@ -56,7 +56,7 @@
- $ARTIFACTS_FOLDER/*
expire_in: 10 mins
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
.pkg_and_sign:macos:
@@ -90,4 +90,4 @@
- $ARTIFACTS_FOLDER/*
expire_in: 10 mins
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
\ No newline at end of file
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
diff --git a/NodeApp/.gitlab-ci/06_stageBuild.yml b/NodeApp/.gitlab-ci/06_stageBuild.yml
index f1aeaa2..322912d 100644
--- a/NodeApp/.gitlab-ci/06_stageBuild.yml
+++ b/NodeApp/.gitlab-ci/06_stageBuild.yml
@@ -20,4 +20,5 @@ build:version:
- $ARTIFACTS_FOLDER/*
expire_in: 10 mins
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true" || $CI_COMMIT_BRANCH == "test"'
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
+ - if: $CI_COMMIT_BRANCH == "test"
diff --git a/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml b/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml
index 9bc92c1..be2b3ba 100644
--- a/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml
+++ b/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml
@@ -19,7 +19,7 @@ pkg_and_sign:debian:test:
artifacts:
expire_in: 2 weeks
rules:
- - if: '$CI_COMMIT_BRANCH == "test"'
+ - if: $CI_COMMIT_BRANCH == "test"
pkg_and_sign:macos:
@@ -37,7 +37,7 @@ pkg_and_sign:macos:test:
artifacts:
expire_in: 2 weeks
rules:
- - if: '$CI_COMMIT_BRANCH == "test"'
+ - if: $CI_COMMIT_BRANCH == "test"
diff --git a/NodeApp/.gitlab-ci/08_stageClean.yml b/NodeApp/.gitlab-ci/08_stageClean.yml
index ef5ae4c..8954bd7 100644
--- a/NodeApp/.gitlab-ci/08_stageClean.yml
+++ b/NodeApp/.gitlab-ci/08_stageClean.yml
@@ -8,7 +8,7 @@ clean:release:
- !reference [ .get_version_dependent_vars, script ]
- !reference [ .clean_release, script ]
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
clean:packages:
@@ -21,7 +21,7 @@ clean:packages:
- !reference [ .get_version_dependent_vars, script ]
- !reference [ .clean_packages, script ]
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
clean:release:dev:
@@ -35,7 +35,7 @@ clean:release:dev:
- !reference [ .get_version_dependent_vars, script ]
- !reference [ .clean_release, script ]
rules:
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
clean:packages:dev:
@@ -49,7 +49,7 @@ clean:packages:dev:
- !reference [ .get_version_dependent_vars, script ]
- !reference [ .clean_packages, script ]
rules:
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
clean:release:latest:
@@ -61,7 +61,7 @@ clean:release:latest:
- VERSION="Latest"
- !reference [ .clean_release, script ]
rules:
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
clean:release:pre-alpha:
@@ -73,4 +73,6 @@ clean:release:pre-alpha:
- VERSION="Pre-alpha"
- !reference [ .clean_release, script ]
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
\ No newline at end of file
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ when: never
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
diff --git a/NodeApp/.gitlab-ci/09_stageUpload.yml b/NodeApp/.gitlab-ci/09_stageUpload.yml
index fac7c20..7d50365 100644
--- a/NodeApp/.gitlab-ci/09_stageUpload.yml
+++ b/NodeApp/.gitlab-ci/09_stageUpload.yml
@@ -27,7 +27,7 @@ upload:packages:
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${BIN_FILE_WINDOWS_ARM64} "${PACKAGE_URL_WINDOWS_ARM64_BIN}";'
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${BIN_FILE_WINDOWS_X64} "${PACKAGE_URL_WINDOWS_X64_BIN}";'
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
upload:packages:doc:wiki:
@@ -51,4 +51,4 @@ upload:packages:doc:wiki:
# Send package
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${WIKI_ARCHIVE_PATH} "${PACKAGE_URL_WIKI}";'
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
\ No newline at end of file
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
diff --git a/NodeApp/.gitlab-ci/10_stageRelease.yml b/NodeApp/.gitlab-ci/10_stageRelease.yml
index 3485a45..e48306f 100644
--- a/NodeApp/.gitlab-ci/10_stageRelease.yml
+++ b/NodeApp/.gitlab-ci/10_stageRelease.yml
@@ -44,7 +44,7 @@ release:doc:wiki:
# Push the change back to the master branch of the wiki
- git push origin "HEAD:main"
rules:
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
release:gitlab:
@@ -58,7 +58,7 @@ release:gitlab:
- RELEASE_NAME=$VERSION
- !reference [ .release_gitlab, script ]
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true"'
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
release:gitlab:latest:
@@ -72,7 +72,7 @@ release:gitlab:latest:
- RELEASE_NAME="Latest"
- !reference [ .release_gitlab, script ]
rules:
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
release:gitlab:pre-alpha:
@@ -86,4 +86,6 @@ release:gitlab:pre-alpha:
- RELEASE_NAME="Pre-alpha"
- !reference [ .release_gitlab, script ]
rules:
- - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
\ No newline at end of file
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ when: never
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
--
GitLab