[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
commit 641f1304475402c975ede04b11e9be7c8675411b
Merge: 4013e50cb 246fdd874
Author: teor <teor@xxxxxxxxxxxxxx>
Date: Wed Oct 23 08:35:17 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
.appveyor.yml | 6 +++---
.travis.yml | 6 ++++--
changes/ticket31372_appveyor | 4 ++++
changes/ticket31372_travis | 4 ++++
4 files changed, 15 insertions(+), 5 deletions(-)
diff --cc .travis.yml
index c48294f36,595be57a9..6078210c5
--- a/.travis.yml
+++ b/.travis.yml
@@@ -15,13 -15,17 +15,15 @@@ compiler
os:
- linux
- - osx
-## The build matrix in the following stanza expands into builds for each
-## OS and compiler.
+## We don't use the build matrix cross-product, because it makes too many jobs
+## Instead, we list each job under matrix: include:
env:
global:
- ## The Travis CI environment allows us two cores, so let's use both.
- - MAKEFLAGS="-j 2"
+ ## The Travis CI environment allows us two cores, so let's use both. Also,
+ ## let's use the "-k" flag so that we get all of the compilation failures,
+ ## not just the first one.
+ - MAKEFLAGS="-k -j 2"
## We turn on hardening by default
## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later
- HARDENING_OPTIONS="--enable-expensive-hardening"
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits