sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #20390: CI/Cirrus: Skip merge_base step for non-PRs

Browse Source 
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
This commit is contained in:
MarcoFalke 2020-11-16 07:59:39 +01:00 committed by pasta
parent 3a0e88cf6f
commit cc55e4e5a9
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cirrus.yml
View File

@ -29,6 +29,7 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
depends_releases_cache: depends_releases_cache:
folder: "/tmp/cirrus-ci-build/releases" folder: "/tmp/cirrus-ci-build/releases"
merge_base_script: merge_base_script:
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
- bash -c "$PACKAGE_MANAGER_INSTALL git" - bash -c "$PACKAGE_MANAGER_INSTALL git"
- git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH - git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
- git config --global user.email "ci@ci.ci" - git config --global user.email "ci@ci.ci"