Commit 3fcab3ae authored by Administrator's avatar Administrator
Browse files

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.
parent 53574909
......@@ -21,7 +21,7 @@ RebaseCheck:
- ci_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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment