Merging 2024Q2_RC into develop

Merging 2024Q2_RC into develop #5 (closed)

Merge request reports

Loading
+9 −1
Changes for .gitlab-ci.yml: 9 added lines, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -15,13 +15,21 @@ include:
    rules:
    rules:
      - if: '$CI_COMMIT_REF_NAME == "develop"'
      - 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
  - project: osl/code/org.etsi.osl.main
    ref: develop
    ref: develop
    file: 
    file: 
      - ci-templates/default.yml
      - ci-templates/default.yml
      - ci-templates/build_unprotected.yml
      - ci-templates/build_unprotected.yml
    rules:
    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:
maven_build:
  extends: .maven_build
  extends: .maven_build
+1 −1
Changes for pom.xml: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@
	<parent>
	<parent>
		<groupId>org.etsi.osl</groupId>
		<groupId>org.etsi.osl</groupId>
		<artifactId>org.etsi.osl.main</artifactId>
		<artifactId>org.etsi.osl.main</artifactId>
		<version>1.0.0-SNAPSHOT</version>
		<version>1.0.0</version>
		<relativePath>../org.etsi.osl.main</relativePath>
		<relativePath>../org.etsi.osl.main</relativePath>
	</parent>
	</parent>
	
	
Loading