File tree Expand file tree Collapse file tree 2 files changed +13
-2
lines changed Expand file tree Collapse file tree 2 files changed +13
-2
lines changed Original file line number Diff line number Diff line change 16
16
CTIMETEST : yes
17
17
BENCH : yes
18
18
ITERS : 2
19
- # We only need the top commit
20
- CIRRUS_CLONE_DEPTH : 1
21
19
22
20
cat_logs_snippet : &CAT_LOGS
23
21
always :
@@ -32,6 +30,14 @@ cat_logs_snippet: &CAT_LOGS
32
30
- cat test_env.log || true
33
31
- env
34
32
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
+
35
41
task :
36
42
name : " x86_64: Linux (Debian stable)"
37
43
container :
81
87
CC : gcc
82
88
- env :
83
89
CC : clang
90
+ << : *MERGE_BASE
84
91
test_script :
85
92
- ./ci/cirrus.sh
86
93
<< : *CAT_LOGS
@@ -107,6 +114,7 @@ task:
107
114
BIGNUM : gmp
108
115
- env :
109
116
BIGNUM : no
117
+ << : *MERGE_BASE
110
118
test_script :
111
119
- ./ci/cirrus.sh
112
120
<< : *CAT_LOGS
@@ -163,6 +171,7 @@ task:
163
171
- brew link valgrind
164
172
brew_script :
165
173
- brew install automake libtool gmp gcc@9
174
+ << : *MERGE_BASE
166
175
test_script :
167
176
- ./ci/cirrus.sh
168
177
<< : *CAT_LOGS
@@ -184,6 +193,7 @@ task:
184
193
EXPERIMENTAL : yes
185
194
SCHNORRSIG : yes
186
195
CTIMETEST : no
196
+ << : *MERGE_BASE
187
197
test_script :
188
198
# https://sourceware.org/bugzilla/show_bug.cgi?id=27008
189
199
- rm /etc/ld.so.cache
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ RUN apt-get update
6
6
7
7
# dkpg-dev: to make pkg-config work in cross-builds
8
8
RUN apt-get install --no-install-recommends --no-upgrade -y \
9
+ git ca-certificates \
9
10
make automake libtool pkg-config dpkg-dev valgrind qemu-user \
10
11
gcc clang libc6-dbg libgmp-dev \
11
12
gcc-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 libgmp-dev:i386 \
You can’t perform that action at this time.
0 commit comments