From f6c5e2341ed7fd76abeaf265a5a37265bee49e18 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 30 Aug 2024 13:53:48 +0000 Subject: [PATCH 1/3] fix: strictly compare between strings --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d872f6..3f669e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ include: - ci-templates/default.yml - ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' - project: osl/code/org.etsi.osl.main ref: develop @@ -29,7 +29,7 @@ include: - ci-templates/default.yml - ci-templates/build_unprotected.yml rules: - - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED' + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"' maven_build: extends: .maven_build -- GitLab From 145f2606ab7f1371f211b7caee3ad9ae58f2c768 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 17 Sep 2024 19:04:31 +0000 Subject: [PATCH 2/3] Development preparation for release 2024Q4 --- pom.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e59e6ef..5f6c22a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,19 @@ org.etsi.osl org.etsi.osl.main - 1.0.0 + 2024Q4-SNAPSHOT ../org.etsi.osl.main org.etsi.osl.centrallog.client org.etsi.osl.centrallog.client - + ${org.etsi.osl.centrallog.client.version} + + + OpenSlice by ETSI + https://osl.etsi.org + + gitlab-maven -- GitLab From c4c1981b3b5d4393f1824b42476611b2e5f36f68 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 14 Jan 2025 12:37:43 +0000 Subject: [PATCH 3/3] Preparing the 2024Q4_RC: - Remove -SNAPSHOT from parent's version at pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f6c22a..780f54e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.etsi.osl org.etsi.osl.main - 2024Q4-SNAPSHOT + 2024Q4 ../org.etsi.osl.main -- GitLab