From 253f2b62933d671bad1eefab92f0661b36f43307 Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Tue, 26 Sep 2023 17:30:41 +0200
Subject: [PATCH 1/6] Correction deploy_merge
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbada4a1b..11750b3d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,7 +160,9 @@ maven_registry:
stage: package
script:
- MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
- - mvn versions:set -DnewVersion=$CI_COMMIT_BRANCH.$MVN_VERSION
+ - 'CI_TARGET_BRANCH_NAME=$(curl -LsS -H "PRIVATE-TOKEN: $AWESOME_GITLAB_API_TOKEN" "https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME" | jq --raw-output ".[0].target_branch")'
+ - MVN_BRANCH = ${ ${CI_COMMIT_BRANCH} : ${CI_TARGET_BRANCH_NAME} }
+ - mvn versions:set -DnewVersion=$MVN_BRANCH.$MVN_VERSION
- mvn versions:commit
- mvn deploy -Dmaven.test.skip=true -Pmia -s ci-settings.xml
rules:
--
GitLab
From c0681649dbcfcf11dd1e67e82aaa923c26712aed Mon Sep 17 00:00:00 2001
From: Philippe Tcherniatinsky <philippe.tcherniatinsky@inra.fr>
Date: Tue, 26 Sep 2023 17:35:29 +0200
Subject: [PATCH 2/6] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11750b3d0..9f700494e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,7 +160,7 @@ maven_registry:
stage: package
script:
- MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
- - 'CI_TARGET_BRANCH_NAME=$(curl -LsS -H "PRIVATE-TOKEN: $AWESOME_GITLAB_API_TOKEN" "https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME" | jq --raw-output ".[0].target_branch")'
+ - CI_TARGET_BRANCH_NAME=$(curl -LsS -H "PRIVATE-TOKEN: $AWESOME_GITLAB_API_TOKEN" "https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME" | jq --raw-output ".[0].target_branch")
- MVN_BRANCH = ${ ${CI_COMMIT_BRANCH} : ${CI_TARGET_BRANCH_NAME} }
- mvn versions:set -DnewVersion=$MVN_BRANCH.$MVN_VERSION
- mvn versions:commit
--
GitLab
From d6384c474190ec8df9896489e3ed2d711823e2e4 Mon Sep 17 00:00:00 2001
From: Philippe Tcherniatinsky <philippe.tcherniatinsky@inra.fr>
Date: Tue, 26 Sep 2023 17:36:50 +0200
Subject: [PATCH 3/6] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f700494e..6d3dc7ff3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,7 +160,7 @@ maven_registry:
stage: package
script:
- MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
- - CI_TARGET_BRANCH_NAME=$(curl -LsS -H "PRIVATE-TOKEN: $AWESOME_GITLAB_API_TOKEN" "https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME" | jq --raw-output ".[0].target_branch")
+ - CI_TARGET_BRANCH_NAME=$(curl -LsS -H https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME | jq --raw-output ".[0].target_branch")
- MVN_BRANCH = ${ ${CI_COMMIT_BRANCH} : ${CI_TARGET_BRANCH_NAME} }
- mvn versions:set -DnewVersion=$MVN_BRANCH.$MVN_VERSION
- mvn versions:commit
--
GitLab
From 198557de72ce4882ab238669b67f6374008aff45 Mon Sep 17 00:00:00 2001
From: Philippe Tcherniatinsky <philippe.tcherniatinsky@inra.fr>
Date: Tue, 26 Sep 2023 17:50:59 +0200
Subject: [PATCH 4/6] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d3dc7ff3..5c756c3d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,8 +160,13 @@ maven_registry:
stage: package
script:
- MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
- - CI_TARGET_BRANCH_NAME=$(curl -LsS -H https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME | jq --raw-output ".[0].target_branch")
- - MVN_BRANCH = ${ ${CI_COMMIT_BRANCH} : ${CI_TARGET_BRANCH_NAME} }
+ - API_URL= "https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME"
+ - CI_TARGET_BRANCH_NAME=$(curl $API_URL | jq --raw-output ".[0].target_branch")
+ - if [ -z "${CI_COMMIT_BRANCH}" ]; then
+ MVN_BRANCH=$CI_COMMIT_BRANCH
+ else
+ MVN_BRANCH=$CI_TARGET_BRANCH_NAME
+ fi
- mvn versions:set -DnewVersion=$MVN_BRANCH.$MVN_VERSION
- mvn versions:commit
- mvn deploy -Dmaven.test.skip=true -Pmia -s ci-settings.xml
--
GitLab
From f9f34c64779ad45d1f78a8b79e88d7c0ec6759c6 Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Tue, 26 Sep 2023 18:23:41 +0200
Subject: [PATCH 5/6] jq from docker
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c756c3d4..354a41800 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,7 +161,7 @@ maven_registry:
script:
- MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
- API_URL= "https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME"
- - CI_TARGET_BRANCH_NAME=$(curl $API_URL | jq --raw-output ".[0].target_branch")
+ - CI_TARGET_BRANCH_NAME=$(curl $API_URL | docker run --rm -i imega/jq -c ".[0].target_branch")
- if [ -z "${CI_COMMIT_BRANCH}" ]; then
MVN_BRANCH=$CI_COMMIT_BRANCH
else
--
GitLab
From 0a578dd3a48bf856f107b91637387a243dd8fcf5 Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Wed, 27 Sep 2023 09:50:19 +0200
Subject: [PATCH 6/6] Correction deploy_merge
---
.gitlab-ci.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 354a41800..08b46d08b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,12 +160,10 @@ maven_registry:
stage: package
script:
- MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
- - API_URL= "https://forgemia.inra.fr/api/v4/projects/$CI_PROJECT_ID/merge_requests?source_branch=$CI_COMMIT_REF_NAME"
- - CI_TARGET_BRANCH_NAME=$(curl $API_URL | docker run --rm -i imega/jq -c ".[0].target_branch")
- - if [ -z "${CI_COMMIT_BRANCH}" ]; then
- MVN_BRANCH=$CI_COMMIT_BRANCH
- else
- MVN_BRANCH=$CI_TARGET_BRANCH_NAME
+ - 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
--
GitLab