diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-16 07:59:39 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-16 07:59:43 +0100 |
| commit | 37a463481176b1e2d8f562892ca5732aa7fe09c1 (patch) | |
| tree | 484a555f7ea6616006f7e89dda80fa7ab1e6c1f6 | |
| parent | 2fa085a5d7522f9a045f6dab1cf0a4768b35715a (diff) | |
| parent | 20e491ddcb2617472c15294067768e8ce122499a (diff) | |
| download | bitcoin-37a463481176b1e2d8f562892ca5732aa7fe09c1.tar.xz | |
Merge #20390: CI/Cirrus: Skip merge_base step for non-PRs
20e491ddcb2617472c15294067768e8ce122499a 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 20e491ddcb2617472c15294067768e8ce122499a
Tree-SHA512: 9fd8db2e19a3145f7dccfca107631b20df8c94d385f624e2bcef2fa18e38bf3e23c6c68fc8241decedbf1413bf69ca572cff75e1ccf82c09ac50443001ec5ae5
| -rw-r--r-- | .cirrus.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 415aa549f1..237560fc2e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,6 +29,7 @@ global_task_template: &GLOBAL_TASK_TEMPLATE depends_releases_cache: folder: "/tmp/cirrus-ci-build/releases" merge_base_script: + - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi - bash -c "$PACKAGE_MANAGER_INSTALL git" - git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH - git config --global user.email "ci@ci.ci" |