From a1a4eb0c8da7de98e6ced9bebf80aa0264454cf1 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 19 Dec 2023 13:33:56 +0000 Subject: [PATCH 1/3] used rules instead of deprecated syntax --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b167223..03bbfd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,14 @@ include: - ci-templates/default.yml + - local: ci-templates/build.yml - only: - - main - - develop - + rules: + - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop"' + - local: ci-templates/build_unprotected.yml - except: - - main - - develop + rules: + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + maven_build: extends: .maven_build -- GitLab From aca86b679dfa541d35818e8e92030e4d3df53855 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 19 Dec 2023 13:35:35 +0000 Subject: [PATCH 2/3] testing solution --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03bbfd4..d6e418c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,11 +3,11 @@ include: - local: ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop"' + - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "13-fix-issue-with-jobs-not-running-with-protected-templates"' - local: ci-templates/build_unprotected.yml rules: - - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "13-fix-issue-with-jobs-not-running-with-protected-templates"' maven_build: -- GitLab From d57bae39282a6f5166e54a450908ae81dfd0f0f5 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 19 Dec 2023 13:38:55 +0000 Subject: [PATCH 3/3] Revert "testing solution" This reverts commit aca86b679dfa541d35818e8e92030e4d3df53855 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6e418c..03bbfd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,11 +3,11 @@ include: - local: ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "13-fix-issue-with-jobs-not-running-with-protected-templates"' + - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop"' - local: ci-templates/build_unprotected.yml rules: - - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "13-fix-issue-with-jobs-not-running-with-protected-templates"' + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' maven_build: -- GitLab