[tor-commits] [tor/release-0.3.3] Merge branch 'ticket27252-032' into ticket27252-033

[nickm at torproject.org]

commit ae2085dd7be279b0fc3ff9c582d35a498c63350a
Merge: 8691046ac 92f1a8af8
Author: teor <teor at torproject.org>
Date:   Thu Aug 23 18:18:50 2018 +1000

    Merge branch 'ticket27252-032' into ticket27252-033
    
    Semantic merge:
    - Rust offline and online were swapped in ticket27252-032
    - TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2

 .travis.yml             | 23 +++++++++++++++++++----
 changes/ticket27252     |  6 ++++++
 changes/ticket27252-032 |  5 +++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --cc .travis.yml
index 09bd04505,bbf0b575b..bf0152384
--- a/.travis.yml
+++ b/.travis.yml
@@@ -37,7 -37,7 +37,8 @@@ env
      ## and it's going to take a while for them to be fixed. See:
      ##   https:/trac.torproject.org/projects/tor/ticket/25386
      ##   https:/trac.torproject.org/projects/tor/ticket/26398
-     - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS=""
 -    - RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
++    ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
++    - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
  
  matrix:
    ## include creates builds with gcc, linux, sudo: false
@@@ -50,9 -50,10 +51,9 @@@
      # - env: HARDENING_OPTIONS=""
      ## We check asciidoc with distcheck, to make sure we remove doc products
      - env: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
-     ## Check rust offline with distcheck, to make sure we remove rust products
 -    ## Check rust online without hardening (see above), and without distcheck
 -    ## Distcheck doesn't work with rust in 0.3.2
 -    ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
 -    - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS=""
++    ## Check rust online with distcheck, to make sure we remove rust products
 +    ## But without hardening (see above)
-     - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
++    - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS=""
  
    ## Uncomment to allow the build to report success (with non-required
    ## sub-builds continuing to run) if all required sub-builds have
@@@ -69,9 -70,23 +70,23 @@@
      ## Clang doesn't work in containerized builds, see below.
      - compiler: clang
        sudo: false
-     ## We also exclude non-containerized gcc, because they're slow and redundant.
+     ## Non-containerized gcc are slow and redundant.
      - compiler: gcc
        sudo: required
+     ## gcc on OSX is less useful, because the default compiler is clang.
+     - compiler: gcc
+       os: osx
+     ## gcc on Linux with no env is redundant, because all the custom builds use
+     ## gcc on Linux
+     - compiler: gcc
+       os: linux
+       env:
+     ## offline rust builds for gcc on Linux are redundant, because we do an
+     ## online rust build for gcc on Linux
+     - compiler: gcc
+       os: linux
+       ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
 -      env: RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
++      env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
  
  ## We don't need sudo. (The "apt:" stanza after this allows us to not need
  ## sudo; otherwise, we would need it for getting dependencies.)