nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tlyu-github/travis-workaround-master'

Browse Source
This commit is contained in:
Nick Mathewson 2018-01-19 10:18:55 -05:00
commit 63e549a6b4
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.travis.yml
View File

@ -1,8 +1,10 @@
language: c language: c
compiler: ## Comment out the compiler list for now to allow an explicit build
- gcc ## matrix.
- clang # compiler:
# - gcc
# - clang
notifications: notifications:
irc: irc:
@ -28,6 +30,10 @@ dist: trusty
## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo;
## otherwise, we would need it for getting dependencies.) ## 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 sudo: false
## (Linux only) Download our dependencies ## (Linux only) Download our dependencies
@ -55,9 +61,13 @@ env:
## The Travis CI environment allows us two cores, so let's use both. ## The Travis CI environment allows us two cores, so let's use both.
- MAKEFLAGS="-j 2" - MAKEFLAGS="-j 2"
matrix: 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="--enable-rust --enable-cargo-online-mode"
- RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true # - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
- RUST_OPTIONS="" # - RUST_OPTIONS=""
matrix: matrix:
## If one build in the matrix fails (e.g. if building withour Rust and Clang ## If one build in the matrix fails (e.g. if building withour Rust and Clang
@ -65,6 +75,28 @@ matrix:
## entire job early and call the whole thing a failure. ## entire job early and call the whole thing a failure.
fast_finish: true 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="--enable-rust" TOR_RUST_DEPENDENCIES=true
- 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="--enable-rust" TOR_RUST_DEPENDENCIES=true
- compiler: clang
sudo: required
env: RUST_OPTIONS=""
before_install: before_install:
## If we're on OSX, homebrew usually needs to updated first ## If we're on OSX, homebrew usually needs to updated first
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi