Merging 2024Q2_RC into develop

Merging 2024Q2_RC into develop #6 (closed)

.gitlab-ci.yml

@@ -15,13 +15,21 @@ include:
     rules:
       - if: '$CI_COMMIT_REF_NAME == "develop"'
 
+  - project: osl/code/org.etsi.osl.main
+    ref: $CI_COMMIT_REF_NAME
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+
   - project: osl/code/org.etsi.osl.main
     ref: develop
     file: 
       - ci-templates/default.yml
       - 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 != "develop" && !$CI_COMMIT_REF_PROTECTED'
 
 maven_build:
   extends: .maven_build