diff --git a/ExerciseChecker/.gitlab-ci/06_stageBuild.yml b/ExerciseChecker/.gitlab-ci/06_stageBuild.yml index a0c6ca411fd86c59aa49fd601563bd262e3ef89f..54a05e7c9b67540f0753347589c0fab959a85b45 100644 --- a/ExerciseChecker/.gitlab-ci/06_stageBuild.yml +++ b/ExerciseChecker/.gitlab-ci/06_stageBuild.yml @@ -12,4 +12,5 @@ build:version: # Here docker buildx can use cached images created in previous step - docker buildx build --platform $DOCKER_PLATFORMS --file $DOCKERFILE --push --tag $CONTAINER_IMAGE . rules: - - if: '$CI_COMMIT_REF_PROTECTED == "true" || $CI_COMMIT_BRANCH == "test"' \ No newline at end of file + - if: $CI_COMMIT_REF_PROTECTED == "true" + - if: $CI_COMMIT_BRANCH == "test" \ No newline at end of file diff --git a/ExerciseChecker/.gitlab-ci/07_stageClean.yml b/ExerciseChecker/.gitlab-ci/07_stageClean.yml index 5d3fcbaadf0bf20f7e8787dd25ca620158c46305..e710ca84b83348a7333d074d32546339c1151c1f 100644 --- a/ExerciseChecker/.gitlab-ci/07_stageClean.yml +++ b/ExerciseChecker/.gitlab-ci/07_stageClean.yml @@ -7,7 +7,7 @@ clean:release: - !reference [ .get_version, script ] - !reference [ .clean_release, script ] rules: - - if: '$CI_COMMIT_REF_PROTECTED == "true"' + - if: $CI_COMMIT_REF_PROTECTED == "true" clean:packages: @@ -19,7 +19,7 @@ clean:packages: - !reference [ .get_version, script ] - !reference [ .clean_packages, script ] rules: - - if: '$CI_COMMIT_REF_PROTECTED == "true"' + - if: $CI_COMMIT_REF_PROTECTED == "true" clean:release:dev: @@ -32,7 +32,7 @@ clean:release:dev: - VERSION="${VERSION}${VERSION_DEV_SUFFIX}" - !reference [ .clean_release, script ] rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH clean:packages:dev: @@ -45,7 +45,7 @@ clean:packages:dev: - VERSION="${VERSION}${VERSION_DEV_SUFFIX}" - !reference [ .clean_packages, script ] rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH clean:dockerhub:dev: @@ -72,4 +72,4 @@ clean:dockerhub:dev: ## Delete tag - 'curl --header "Authorization: JWT ${TOKEN}" --request DELETE "https://hub.docker.com/v2/repositories/${DOCKER_REGISTRY_IMAGE}/tags/${VERSION}/"' rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' \ No newline at end of file + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH \ No newline at end of file diff --git a/ExerciseChecker/.gitlab-ci/08_stageUpload.yml b/ExerciseChecker/.gitlab-ci/08_stageUpload.yml index f5eab6c649da3d6def143b33cb069e039597f34c..e73bbe3b1a72c6376ae0e7a9c866f0ed60aa4786 100644 --- a/ExerciseChecker/.gitlab-ci/08_stageUpload.yml +++ b/ExerciseChecker/.gitlab-ci/08_stageUpload.yml @@ -19,4 +19,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/ExerciseChecker/.gitlab-ci/09_stageRelease.yml b/ExerciseChecker/.gitlab-ci/09_stageRelease.yml index 5d6fdc2eadd544306d2850e02420a5f148ae1952..f78117633fc8b4ab0b748d6d8dbe7f7513016d1a 100644 --- a/ExerciseChecker/.gitlab-ci/09_stageRelease.yml +++ b/ExerciseChecker/.gitlab-ci/09_stageRelease.yml @@ -12,7 +12,8 @@ release:dockerhub:latest: # Push latest tag - docker buildx imagetools create $CONTAINER_IMAGE --tag $DOCKER_REGISTRY_IMAGE:latest rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "test"' + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "test" release:doc:wiki: @@ -60,7 +61,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: @@ -100,4 +101,4 @@ release:gitlab: --header "JOB-TOKEN: $CI_JOB_TOKEN" \ --request POST "${GITLAB_API_PROJECT_URL}/releases" 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