Skip to content
Snippets Groups Projects
Commit 059612e2 authored by trantzas's avatar trantzas
Browse files

Merge branch 'develop' into 'main'

MR for Release 2024Q4
parents 0dd9e63d 1b8a4d7b
No related branches found
No related tags found
2 merge requests!9Merge branch 'main' into 'develop',!8MR for Release 2024Q4
Pipeline #11321 passed
......@@ -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
......@@ -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> |
&copy; {{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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment