From: teor Date: Tue, 22 Oct 2019 22:32:52 +0000 (+1000) Subject: Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 X-Git-Tag: tor-0.3.5.9~14^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c77162e4e95fdfd6a5cc422802dee943750b14b7;p=thirdparty%2Ftor.git Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 --- c77162e4e95fdfd6a5cc422802dee943750b14b7 diff --cc .travis.yml index 1523ba8ca6,64f8380bce..8f7e8e4be1 --- 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"