]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
authorteor <teor@torproject.org>
Tue, 22 Oct 2019 22:32:52 +0000 (08:32 +1000)
committerteor <teor@torproject.org>
Tue, 22 Oct 2019 22:32:52 +0000 (08:32 +1000)
1  2 
.appveyor.yml
.travis.yml

diff --cc .appveyor.yml
Simple merge
diff --cc .travis.yml
index 1523ba8ca63eda9b73d12bcc9a40d4155e5da663,64f8380bced4cbeb2541cebd7539d9be20e99562..8f7e8e4be150e9de1dc4cdeac4160fbe4b0b17e4
@@@ -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"