From ba1bf130750aef41b98124625615bbffb8c001c9 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 30 Aug 2024 13:54:10 +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 b4860c3..5870e13 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"' docker_build: extends: .docker_build -- GitLab From 3df2b0f5a3b12d885555d869ec4d495ad05145c6 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 17 Sep 2024 20:15:17 +0000 Subject: [PATCH 2/3] Development preparation for release 2024Q4 --- src/Footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Footer.html b/src/Footer.html index 78f7fdf..d546815 100644 --- a/src/Footer.html +++ b/src/Footer.html @@ -53,7 +53,7 @@ OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive ecosystem for further details. -
{{portalName}} running OSL version version 2024Q2 | +
{{portalName}} running OSL version version 2024Q4-SNAPSHOT | Terms and Conditions | © {{currentYear}} on behalf of osl.etsi.org
-- GitLab From a970069ff091116798a8ee92ae9949a89a609028 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 14 Jan 2025 13:58:11 +0000 Subject: [PATCH 3/3] Preparing the 2024Q4_RC: - Remove -SNAPSHOT from Footer.html --- src/Footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Footer.html b/src/Footer.html index d546815..d47cba3 100644 --- a/src/Footer.html +++ b/src/Footer.html @@ -53,7 +53,7 @@ OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive ecosystem for further details.
-
{{portalName}} running OSL version version 2024Q4-SNAPSHOT | +
{{portalName}} running OSL version version 2024Q4 | Terms and Conditions | © {{currentYear}} on behalf of osl.etsi.org
-- GitLab