]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.9' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Apr 2018 14:38:37 +0000 (10:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Apr 2018 14:38:37 +0000 (10:38 -0400)
1  2 
.travis.yml

diff --cc .travis.yml
index bf55b7756a4f3dc031037f53a004d280d2c81bbe,6da3027b85fa80f319fa2a00b68a94e2d4bfe526..3f133782d19496b16588f6882473745d4009e95c
@@@ -95,10 -88,10 +95,12 @@@ matrix
    ## entry under that key outside the "include" clause.
    include:
      - compiler: gcc
 +    - compiler: gcc
 +      env: RUST_OPTIONS=""
      - compiler: gcc
        env: COVERAGE_OPTIONS="--enable-coverage"
+     - compiler: gcc
+       env: DISTCHECK="yes"
      ## The "sudo: required" forces non-containerized builds, working
      ## around a Travis CI environment issue: clang LeakAnalyzer fails
      ## because it requires ptrace and the containerized environment no