Skip to content

Commit 2168b1d

Browse files
ci: Use Cirrus "greedy" flag to use idle CPU time when available
1 parent 358f587 commit 2168b1d

File tree

1 file changed

+17
-34
lines changed

1 file changed

+17
-34
lines changed

.cirrus.yml

+17-34
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
# Specific warnings can be disabled with -Wno-error=foo.
55
# -pedantic-errors is not equivalent to -Werror=pedantic and thus not implied by -Werror according to the GCC manual.
66
WERROR_CFLAGS: -Werror -pedantic-errors
7-
MAKEFLAGS: -j2
7+
MAKEFLAGS: -j4
88
BUILD: check
99
### secp256k1 config
1010
ECMULTWINDOW: auto
@@ -50,14 +50,19 @@ merge_base_script_snippet: &MERGE_BASE
5050
- git config --global user.name "ci"
5151
- git merge FETCH_HEAD # Merge base to detect silent merge conflicts
5252

53-
task:
54-
name: "x86_64: Linux (Debian stable)"
53+
linux_container_snippet: &LINUX_CONTAINER
5554
container:
5655
dockerfile: ci/linux-debian.Dockerfile
5756
# Reduce number of CPUs to be able to do more builds in parallel.
5857
cpu: 1
58+
# Gives us more CPUs for free if they're available.
59+
greedy: true
5960
# More than enough for our scripts.
6061
memory: 1G
62+
63+
task:
64+
name: "x86_64: Linux (Debian stable)"
65+
<< : *LINUX_CONTAINER
6166
matrix: &ENV_MATRIX
6267
- env: {WIDEMUL: int64, RECOVERY: yes}
6368
- env: {WIDEMUL: int64, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes}
@@ -83,10 +88,7 @@ task:
8388

8489
task:
8590
name: "i686: Linux (Debian stable)"
86-
container:
87-
dockerfile: ci/linux-debian.Dockerfile
88-
cpu: 1
89-
memory: 1G
91+
<< : *LINUX_CONTAINER
9092
env:
9193
HOST: i686-linux-gnu
9294
ECDH: yes
@@ -165,10 +167,7 @@ task:
165167

166168
task:
167169
name: "s390x (big-endian): Linux (Debian stable, QEMU)"
168-
container:
169-
dockerfile: ci/linux-debian.Dockerfile
170-
cpu: 1
171-
memory: 1G
170+
<< : *LINUX_CONTAINER
172171
env:
173172
WRAPPER_CMD: qemu-s390x
174173
SECP256K1_TEST_ITERS: 16
@@ -188,10 +187,7 @@ task:
188187

189188
task:
190189
name: "ARM32: Linux (Debian stable, QEMU)"
191-
container:
192-
dockerfile: ci/linux-debian.Dockerfile
193-
cpu: 1
194-
memory: 1G
190+
<< : *LINUX_CONTAINER
195191
env:
196192
WRAPPER_CMD: qemu-arm
197193
SECP256K1_TEST_ITERS: 16
@@ -212,10 +208,7 @@ task:
212208

213209
task:
214210
name: "ARM64: Linux (Debian stable, QEMU)"
215-
container:
216-
dockerfile: ci/linux-debian.Dockerfile
217-
cpu: 1
218-
memory: 1G
211+
<< : *LINUX_CONTAINER
219212
env:
220213
WRAPPER_CMD: qemu-aarch64
221214
SECP256K1_TEST_ITERS: 16
@@ -233,10 +226,7 @@ task:
233226

234227
task:
235228
name: "ppc64le: Linux (Debian stable, QEMU)"
236-
container:
237-
dockerfile: ci/linux-debian.Dockerfile
238-
cpu: 1
239-
memory: 1G
229+
<< : *LINUX_CONTAINER
240230
env:
241231
WRAPPER_CMD: qemu-ppc64le
242232
SECP256K1_TEST_ITERS: 16
@@ -254,10 +244,7 @@ task:
254244

255245
task:
256246
name: "x86_64 (mingw32-w64): Windows (Debian stable, Wine)"
257-
container:
258-
dockerfile: ci/linux-debian.Dockerfile
259-
cpu: 1
260-
memory: 1G
247+
<< : *LINUX_CONTAINER
261248
env:
262249
WRAPPER_CMD: wine64-stable
263250
SECP256K1_TEST_ITERS: 16
@@ -275,9 +262,8 @@ task:
275262

276263
# Sanitizers
277264
task:
265+
<< : *LINUX_CONTAINER
278266
container:
279-
dockerfile: ci/linux-debian.Dockerfile
280-
cpu: 1
281267
memory: 2G
282268
env:
283269
ECDH: yes
@@ -319,15 +305,12 @@ task:
319305

320306
task:
321307
name: "C++ -fpermissive"
322-
container:
323-
dockerfile: ci/linux-debian.Dockerfile
324-
cpu: 1
325-
memory: 1G
308+
<< : *LINUX_CONTAINER
326309
env:
327310
# ./configure correctly errors out when given CC=g++.
328311
# We hack around this by passing CC=g++ only to make.
329312
CC: gcc
330-
MAKEFLAGS: -j2 CC=g++ CFLAGS=-fpermissive\ -g
313+
MAKEFLAGS: -j4 CC=g++ CFLAGS=-fpermissive\ -g
331314
WERROR_CFLAGS:
332315
EXPERIMENTAL: yes
333316
ECDH: yes

0 commit comments

Comments
 (0)