Skip to content
Snippets Groups Projects
Commit 84daf31f authored by trantzas's avatar trantzas
Browse files

Merge branch '4-update-gitlab-ci-file-to-use-inherited-jobs-from-main' into 'develop'

Resolve "Update gitlab CI file to use inherited jobs from main"

See merge request !3
parents 2613470f 46ce8d34
No related branches found
No related tags found
3 merge requests!7Merging develop (merged from 2024Q2_RC) into main, creating 2024Q2 Release,!6Merging 2024Q2_RC into main, creating 2024Q2 Release,!3Resolve "Update gitlab CI file to use inherited jobs from main"
Pipeline #4126 passed
stages: include:
- deploy - project: osl/code/org.etsi.osl.main
ref: main
file:
- ci-templates/default.yml
- ci-templates/build.yml
rules:
- if: '$CI_COMMIT_REF_NAME == "main"'
- project: osl/code/org.etsi.osl.main
ref: develop
file:
- ci-templates/default.yml
- ci-templates/build.yml
rules:
- if: '$CI_COMMIT_REF_NAME == "develop"'
deploy: - project: osl/code/org.etsi.osl.main
stage: deploy ref: develop
image: maven:3.9.5-ibm-semeru-17-focal file:
script: - ci-templates/default.yml
- mvn deploy -s ci_settings.xml -DskipTests - ci-templates/build_unprotected.yml
rules:
- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
maven_build:
extends: .maven_build
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