From 20398d299ca6343c0f9fe1b52c00d9397fd373ab Mon Sep 17 00:00:00 2001
From: Alan Nelson <alan.nelson@nebraska.edu>
Date: Fri, 23 Aug 2024 09:35:49 -0500
Subject: [PATCH] Update branch name source
---
merge-request-check/approval_check.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/merge-request-check/approval_check.py b/merge-request-check/approval_check.py
index 45e7019..5585038 100644
--- a/merge-request-check/approval_check.py
+++ b/merge-request-check/approval_check.py
@@ -11,11 +11,15 @@ This is primarily intended to act as an approval step for outside developers
using our hosting stack and CI/CD processes.
'''
+if os.environ.get('CI_PIPELINE_SOURCE ') == 'merge_request_event':
+ branch = os.environ.get('CI_MERGE_REQUEST_TARGET_BRANCH_NAME')
+else:
+ branch = os.environ.get('CI_COMMIT_BRANCH')
response = requests.post('https://its-lampprod1-whm.unl.edu/merge_auth_check.php', data={
'repo': os.environ.get('CI_PROJECT_PATH'),
'sha': os.environ.get('CI_COMMIT_SHA'),
- 'branch': os.environ.get('CI_COMMIT_BRANCH'),
+ 'branch': branch,
'user': os.environ.get('GITLAB_USER_LOGIN')
})
--
GitLab