diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbada4a1b0f0e488acefc5f7af31ca349a78d03f..08b46d08b2fe0fc9807f3fda2b6debe7cce6e42c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,7 +160,12 @@ maven_registry: stage: package script: - MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - - mvn versions:set -DnewVersion=$CI_COMMIT_BRANCH.$MVN_VERSION + - if [ -z "$CI_COMMIT_BRANCH" ]; then + MVN_BRANCH=$CI_COMMIT_BRANCH; + else + MVN_BRANCH=$(curl -X GET "https://forgemia.inra.fr/api/v4/projects/${CI_PROJECT_ID}/merge_requests?source_branch=${CI_COMMIT_REF_NAME}" | docker run --rm -i imega/jq -c ".[0].target_branch"); + fi + - mvn versions:set -DnewVersion=$MVN_BRANCH.$MVN_VERSION - mvn versions:commit - mvn deploy -Dmaven.test.skip=true -Pmia -s ci-settings.xml rules: