forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: Run PRs on merge result instead of on the source branch
This is taken from Bitcoin Core's .cirrus.yml
- Loading branch information
1 parent
b994a8b
commit c7f754f
Showing
2 changed files
with
13 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,8 +16,6 @@ env: | |
CTIMETEST: yes | ||
BENCH: yes | ||
ITERS: 2 | ||
# We only need the top commit | ||
CIRRUS_CLONE_DEPTH: 1 | ||
|
||
cat_logs_snippet: &CAT_LOGS | ||
always: | ||
|
@@ -32,6 +30,14 @@ cat_logs_snippet: &CAT_LOGS | |
- cat test_env.log || true | ||
- env | ||
|
||
merge_base_script_snippet: &MERGE_BASE | ||
merge_base_script: | ||
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi | ||
- git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH | ||
- git config --global user.email "[email protected]" | ||
- git config --global user.name "ci" | ||
- git merge FETCH_HEAD # Merge base to detect silent merge conflicts | ||
|
||
task: | ||
name: "x86_64: Linux (Debian stable)" | ||
container: | ||
|
@@ -81,6 +87,7 @@ task: | |
CC: gcc | ||
- env: | ||
CC: clang | ||
<< : *MERGE_BASE | ||
test_script: | ||
- ./ci/cirrus.sh | ||
<< : *CAT_LOGS | ||
|
@@ -107,6 +114,7 @@ task: | |
BIGNUM: gmp | ||
- env: | ||
BIGNUM: no | ||
<< : *MERGE_BASE | ||
test_script: | ||
- ./ci/cirrus.sh | ||
<< : *CAT_LOGS | ||
|
@@ -163,6 +171,7 @@ task: | |
- brew link valgrind | ||
brew_script: | ||
- brew install automake libtool gmp gcc@9 | ||
<< : *MERGE_BASE | ||
test_script: | ||
- ./ci/cirrus.sh | ||
<< : *CAT_LOGS | ||
|
@@ -184,6 +193,7 @@ task: | |
EXPERIMENTAL: yes | ||
SCHNORRSIG: yes | ||
CTIMETEST: no | ||
<< : *MERGE_BASE | ||
test_script: | ||
# https://sourceware.org/bugzilla/show_bug.cgi?id=27008 | ||
- rm /etc/ld.so.cache | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters