Skip to content

Commit 9361f36

Browse files
ci: Select number of parallel make jobs depending on CI environment
This should improve compilation times on macOS. Things can certainly be improved further, e.g., by running the benchmarks in parallel.
1 parent 28eccdf commit 9361f36

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.cirrus.yml

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616
CTIMETEST: yes
1717
BENCH: yes
1818
ITERS: 2
19+
MAKEFLAGS: -j2
1920

2021
cat_logs_snippet: &CAT_LOGS
2122
always:
@@ -131,6 +132,8 @@ task:
131132
env:
132133
HOMEBREW_NO_AUTO_UPDATE: 1
133134
HOMEBREW_NO_INSTALL_CLEANUP: 1
135+
# Cirrus gives us a fixed number of 12 virtual CPUs. Not that we even have that many jobs at the moment...
136+
MAKEFLAGS: -j13
134137
matrix:
135138
<< : *ENV_MATRIX
136139
matrix:

ci/cirrus.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ valgrind --version || true
2121
--with-valgrind="$WITH_VALGRIND" \
2222
--host="$HOST" $EXTRAFLAGS
2323

24-
make -j2
24+
# We have set "-j<n>" in MAKEFLAGS.
25+
make
2526

2627
# Print information about binaries so that we can see that the architecture is correct
2728
file *tests || true
@@ -30,7 +31,7 @@ file .libs/* || true
3031

3132
if [ -n "$BUILD" ]
3233
then
33-
make -j2 "$BUILD"
34+
make "$BUILD"
3435
fi
3536

3637
if [ "$RUN_VALGRIND" = "yes" ]

0 commit comments

Comments
 (0)