Skip to content

Commit c7f754f

Browse files
ci: Run PRs on merge result instead of on the source branch
This is taken from Bitcoin Core's .cirrus.yml
1 parent b994a8b commit c7f754f

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.cirrus.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ env:
1616
CTIMETEST: yes
1717
BENCH: yes
1818
ITERS: 2
19-
# We only need the top commit
20-
CIRRUS_CLONE_DEPTH: 1
2119

2220
cat_logs_snippet: &CAT_LOGS
2321
always:
@@ -32,6 +30,14 @@ cat_logs_snippet: &CAT_LOGS
3230
- cat test_env.log || true
3331
- env
3432

33+
merge_base_script_snippet: &MERGE_BASE
34+
merge_base_script:
35+
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
36+
- git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
37+
- git config --global user.email "[email protected]"
38+
- git config --global user.name "ci"
39+
- git merge FETCH_HEAD # Merge base to detect silent merge conflicts
40+
3541
task:
3642
name: "x86_64: Linux (Debian stable)"
3743
container:
@@ -81,6 +87,7 @@ task:
8187
CC: gcc
8288
- env:
8389
CC: clang
90+
<< : *MERGE_BASE
8491
test_script:
8592
- ./ci/cirrus.sh
8693
<< : *CAT_LOGS
@@ -107,6 +114,7 @@ task:
107114
BIGNUM: gmp
108115
- env:
109116
BIGNUM: no
117+
<< : *MERGE_BASE
110118
test_script:
111119
- ./ci/cirrus.sh
112120
<< : *CAT_LOGS
@@ -163,6 +171,7 @@ task:
163171
- brew link valgrind
164172
brew_script:
165173
- brew install automake libtool gmp gcc@9
174+
<< : *MERGE_BASE
166175
test_script:
167176
- ./ci/cirrus.sh
168177
<< : *CAT_LOGS
@@ -184,6 +193,7 @@ task:
184193
EXPERIMENTAL: yes
185194
SCHNORRSIG: yes
186195
CTIMETEST: no
196+
<< : *MERGE_BASE
187197
test_script:
188198
# https://sourceware.org/bugzilla/show_bug.cgi?id=27008
189199
- rm /etc/ld.so.cache

ci/linux-debian.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ RUN apt-get update
66

77
# dkpg-dev: to make pkg-config work in cross-builds
88
RUN apt-get install --no-install-recommends --no-upgrade -y \
9+
git ca-certificates \
910
make automake libtool pkg-config dpkg-dev valgrind qemu-user \
1011
gcc clang libc6-dbg libgmp-dev \
1112
gcc-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 libgmp-dev:i386 \

0 commit comments

Comments
 (0)