Skip to content
Snippets Groups Projects

Fix CI pipeline for new branch

Merged Florian Uhlig requested to merge f.uhlig/cbmroot_input:fix_CI_pipeline into newFieldMaps
1 file
+ 6
6
Compare changes
  • Side-by-side
  • Inline
+ 6
6
@@ -11,7 +11,7 @@ RebaseCheck:
@@ -11,7 +11,7 @@ RebaseCheck:
refs:
refs:
- merge_requests
- merge_requests
variables:
variables:
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_input" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_input" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "newFieldMaps"
script:
script:
# Get the upstream repository manually. I did not find any other way to have it for
# Get the upstream repository manually. I did not find any other way to have it for
# comparison
# comparison
@@ -20,8 +20,8 @@ RebaseCheck:
@@ -20,8 +20,8 @@ RebaseCheck:
- apk update && apk add git bash
- apk update && apk add git bash
- .scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
- .scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
- git fetch upstream
- git fetch upstream
- hash1=$(git show-ref upstream/master | cut -f1 -d' ')
- hash1=$(git show-ref upstream/newFieldMaps | cut -f1 -d' ')
- hash2=$(git merge-base upstream/master HEAD)
- hash2=$(git merge-base upstream/newFieldMaps HEAD)
- echo "${hash1}"
- echo "${hash1}"
- echo "${hash2}"
- echo "${hash2}"
- if [ "${hash1}" = "${hash2}" ]; then
- if [ "${hash1}" = "${hash2}" ]; then
@@ -42,7 +42,7 @@ LinearHistCheck:
@@ -42,7 +42,7 @@ LinearHistCheck:
refs:
refs:
- merge_requests
- merge_requests
variables:
variables:
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_input" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_input" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "newFieldMaps"
script:
script:
# Get the upstream repository manually. I did not find any other way to have it for
# Get the upstream repository manually. I did not find any other way to have it for
# comparison
# comparison
@@ -51,7 +51,7 @@ LinearHistCheck:
@@ -51,7 +51,7 @@ LinearHistCheck:
- apk update && apk add git bash
- apk update && apk add git bash
- .scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
- .scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
- git fetch upstream
- git fetch upstream
- count=$(git rev-list --min-parents=2 --count upstream/master..HEAD)
- count=$(git rev-list --min-parents=2 --count upstream/newFieldMaps..HEAD)
- echo "${count}"
- echo "${count}"
- if [ 0 = "${count}" ]; then
- if [ 0 = "${count}" ]; then
- echo "History introduced in fork is linear"
- echo "History introduced in fork is linear"
@@ -71,7 +71,7 @@ FileFormatCheck:
@@ -71,7 +71,7 @@ FileFormatCheck:
refs:
refs:
- merge_requests
- merge_requests
variables:
variables:
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_input" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
- $CI_MERGE_REQUEST_PROJECT_PATH == "CbmSoft/cbmroot_input" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "newFieldMaps"
script:
script:
# Get the upstream repository manually. I did not find any other way to have it for
# Get the upstream repository manually. I did not find any other way to have it for
# comparison
# comparison
Loading