From 161a9b9a9f1f50e1dcdaf957e94f87c5956e8b1a Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Wed, 27 Sep 2023 11:18:58 +0200
Subject: [PATCH 1/2] Correction deploy_merge
---
.gitlab-ci.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08b46d08b..8019697e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -159,12 +159,15 @@ maven_registry:
image: maven:3.8.5-openjdk-17
stage: package
script:
- - MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+ - MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) && echo $MVN_VERSION;
- if [ -z "$CI_COMMIT_BRANCH" ]; then
- MVN_BRANCH=$CI_COMMIT_BRANCH;
+ MVN_BRANCH=$CI_COMMIT_BRANCH && echo 'normal commit';
else
+ echo commit on ${CI_COMMIT_REF_NAME};
+ echo "https://forgemia.inra.fr/api/v4/projects/${CI_PROJECT_ID}/merge_requests?source_branch=${CI_COMMIT_REF_NAME}"
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
+ echo $MVN_BRANCH.$MVN_VERSION
- mvn versions:set -DnewVersion=$MVN_BRANCH.$MVN_VERSION
- mvn versions:commit
- mvn deploy -Dmaven.test.skip=true -Pmia -s ci-settings.xml
--
GitLab
From a7ac13416887328d500d377b066220e43503d536 Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Wed, 27 Sep 2023 16:19:30 +0200
Subject: [PATCH 2/2] encore une correction
---
.gitlab-ci.yml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8019697e8..94bb81b74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,14 +160,15 @@ maven_registry:
stage: package
script:
- MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) && echo $MVN_VERSION;
- - if [ -z "$CI_COMMIT_BRANCH" ]; then
- MVN_BRANCH=$CI_COMMIT_BRANCH && echo 'normal commit';
- else
- echo commit on ${CI_COMMIT_REF_NAME};
- echo "https://forgemia.inra.fr/api/v4/projects/${CI_PROJECT_ID}/merge_requests?source_branch=${CI_COMMIT_REF_NAME}"
- 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
- echo $MVN_BRANCH.$MVN_VERSION
+ - if [ -n "$CI_COMMIT_BRANCH" ];
+ then
+ MVN_BRANCH=$CI_COMMIT_BRANCH && echo 'normal commit';
+ else
+ echo commit on ${CI_COMMIT_REF_NAME};
+ echo "https://forgemia.inra.fr/api/v4/projects/${CI_PROJECT_ID}/merge_requests?source_branch=${CI_COMMIT_REF_NAME}"
+ MVN_BRANCH=$(curl 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;
+ echo $MVN_BRANCH.$MVN_VERSION;
- mvn versions:set -DnewVersion=$MVN_BRANCH.$MVN_VERSION
- mvn versions:commit
- mvn deploy -Dmaven.test.skip=true -Pmia -s ci-settings.xml
--
GitLab