From d90645f9babe259e2fb429454f955f86b765043c Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Mon, 19 Apr 2021 17:01:58 +0200
Subject: [PATCH] Fix CI pipeline after GitLab upgrade
Fix the stage for the rebase check.
After the upgrade it lloks like that the pipeline doesn't run any longer in
the context of the forked project but in context of the master project such
that the project path wasn't correct any longer. This allows now to compare
upstream/master to HEAD.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5faeed9da5..d521140cbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ RebaseCheck:
- scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
- git fetch upstream
- hash1=$(git show-ref upstream/master | cut -f1 -d' ')
- - hash2=$(git merge-base upstream/master origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)
+ - hash2=$(git merge-base upstream/master HEAD)
- echo "${hash1}"
- echo "${hash2}"
- if [ "${hash1}" = "${hash2}" ]; then
--
GitLab