Skip to content

Commit 37a4634

Browse files
author
MarcoFalke
committed
Merge #20390: CI/Cirrus: Skip merge_base step for non-PRs
20e491d CI/Cirrus: Skip merge_base step for non-PRs (Luke Dashjr) Pull request description: CIRRUS_BASE_BRANCH is a PR-specific variable and undocumented on non-PR builds. In practice (at the moment), it seems to be HEAD, which in private repositories can be pretty much anything, causing CI to fail if it can't be cleanly merged. By checking CIRRUS_PR first, we can reliably do CI builds of branches outside PRs. ACKs for top commit: MarcoFalke: review ACK 20e491d Tree-SHA512: 9fd8db2e19a3145f7dccfca107631b20df8c94d385f624e2bcef2fa18e38bf3e23c6c68fc8241decedbf1413bf69ca572cff75e1ccf82c09ac50443001ec5ae5
2 parents 2fa085a + 20e491d commit 37a4634

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.cirrus.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
2929
depends_releases_cache:
3030
folder: "/tmp/cirrus-ci-build/releases"
3131
merge_base_script:
32+
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
3233
- bash -c "$PACKAGE_MANAGER_INSTALL git"
3334
- git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
3435
- git config --global user.email "[email protected]"

0 commit comments

Comments
 (0)