From 38761503d7d5dc02a891a2f68b3a1799a3e68622 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 31 May 2022 16:19:55 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#28 Make it work in pipelines too
---
bin/merge | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/bin/merge b/bin/merge
index 99a6520..50d8e72 100755
--- a/bin/merge
+++ b/bin/merge
@@ -52,7 +52,9 @@ else
fi
if [[ -n ${CI_SERVER_URL} ]]; then
GITLAB_URL=$CI_SERVER_URL
- GITLAB_PRIVATE_TOKEN=$CI_JOB_TOKEN
+fi
+if [[ -n ${GITLAB_ACCESS_TOKEN} ]]; then
+ GITLAB_PRIVATE_TOKEN=$GITLAB_ACCESS_TOKEN
fi
if [[ "x${GITLAB_URL}" == "x" ]]; then
echo "Missing GITLAB_URL environment variable, should be set to e.g. https://gitlab.lakedrops.com"
--
GitLab