diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-19 10:18:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-19 10:18:29 -0500 |
| commit | e2aacf100f5112aa8d0564b9f90ce38048ee0a82 (patch) | |
| tree | b8d680aa01772a4307c5e37362bba32516b3fd44 | |
| parent | 44388757c44834d63614c4e13cf88931992afc2a (diff) | |
| parent | 483a59ec2a8285edcf4688755a9a17ddbdab75be (diff) | |
| download | tor-e2aacf100f5112aa8d0564b9f90ce38048ee0a82.tar.gz tor-e2aacf100f5112aa8d0564b9f90ce38048ee0a82.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | .travis.yml | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 8cc210827a..19bbe6df01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -55,8 +61,12 @@ env: ## The Travis CI environment allows us two cores, so let's use both. - MAKEFLAGS="-j 2" matrix: + ## Leave at least one entry here or Travis seems to generate a + ## matrix entry with empty matrix environment variables. Leaving + ## more than one entry causes unwanted matrix entries with + ## unspecified compilers. - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - - RUST_OPTIONS="" + # - RUST_OPTIONS="" matrix: ## If one build in the matrix fails (e.g. if building withour Rust and Clang @@ -64,6 +74,23 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + - compiler: gcc + env: RUST_OPTIONS="" + ## 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 + ## longer allows ptrace. + - compiler: clang + sudo: required + - compiler: clang + sudo: required + env: RUST_OPTIONS="" + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi |