diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4860c350f7b6c0c684524713903a961f614a026..5870e13f6a36eb080380977ca0eb86252481e7d5 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 diff --git a/src/Footer.html b/src/Footer.html index 78f7fdf5fd585101e19a8cb6f34729f4d9b6156f..d47cba38f6634ea13448d659fb158fd7ee580a20 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 <a href="https://osl.etsi.org/ecosystem/">ecosystem</a> for further details. </div> - <div class='font-weight-light'>{{portalName}} running OSL version version 2024Q2 | + <div class='font-weight-light'>{{portalName}} running OSL version version 2024Q4 | <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | © {{currentYear}} on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a> </div>