From b9792bc5492217bd6cf696e6282ce3a7873c7587 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 31 May 2022 16:35:40 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#28 Make it work in pipelines too
---
bin/merge | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/bin/merge b/bin/merge
index 9050cef..3dffa23 100755
--- a/bin/merge
+++ b/bin/merge
@@ -5,6 +5,9 @@ function gitlab() {
METHOD=$2
REQUEST=$3
shift 3
+ if [[ "${DEBUG}" == "yes" ]]; then
+ echo curl --write-out "\nHTTP-Code:%{http_code}" -X "$METHOD" -s -H "Private-Token: ${GITLAB_PRIVATE_TOKEN}" "${GITLAB_URL}"/api/v4/"$REQUEST" "$@"
+ fi
output="$(curl --write-out "\nHTTP-Code:%{http_code}" -X "$METHOD" -s -H "Private-Token: ${GITLAB_PRIVATE_TOKEN}" "${GITLAB_URL}"/api/v4/"$REQUEST" "$@")"
result="$(echo "$output" | grep "{")"
code="$(echo "$output" | grep -m 1 "HTTP-Code:" | cut -d: -f2)"
@@ -50,11 +53,8 @@ elif [[ "$SOURCEBRANCH" == "develop" ]]; then
else
TARGETBRANCH=develop
fi
-if [[ -n ${CI_SERVER_URL} ]]; then
- GITLAB_URL=$CI_SERVER_URL
-fi
-if [[ -n ${GITLAB_ACCESS_TOKEN} ]]; then
- GITLAB_PRIVATE_TOKEN=$GITLAB_ACCESS_TOKEN
+if [[ -n ${CI_SERVER_HOST} ]]; then
+ GITLAB_URL=https://$CI_SERVER_HOST
fi
if [[ "x${GITLAB_URL}" == "x" ]]; then
echo "Missing GITLAB_URL environment variable, should be set to e.g. https://gitlab.lakedrops.com"
--
GitLab