commit 66322718234c0bc7a74be3e5d60b62b9e897abb3 Author: Isis Lovecruft isis@torproject.org Date: Mon Jul 17 21:43:05 2017 +0000
Fix and expand upon our Travis CI configuration.
* CHANGE .travis.yml so that commands for different purposes (e.g. getting dependencies, building, testing) are in separate config lines and sections. * CHANGE .travis.yml to use their mechanism for installing dependencies via apt. [0] This also allows us to not need sudo (the "sudo: false" line). * CHANGE Travis CI tests (the "script:" section) to build and run tests in the same manner as Jenkins (i.e. with --enable-fatal-warnings and --disable-silent-rules and run `make check`). * CHANGE Travis config to install nightly rustc and cargo. * CHANGE Travis config to split rust install into commands for getting dependencies ("before_install:") and commands for installing them ("install:"). * REMOVE shell redirection when downloading the rustup.sh script. * CHANGE cargo to be in "online mode" so that we can get our Rust dependencies. There's not really a way to get the dependencies without using cargo right now. See https://bugs.torproject.org/22830 for more info. * REMOVE cargo "offline mode" envvars from rustup.sh invocation. * ADD commands to get more info about rustc and cargo before building. * FIX sourcing the cargo/toolchain environment that rustup creates. (Without this, our build scripts don't know about anything called "rustc" or "cargo".) * ADD Travis configuration to do all the target builds with both GCC and clang. * ADD make flags to build with both of the cores available. * ADD notifications for IRC, and configure email notifications (to the author of the commit) only if the branch was previously building successfully and the latest commit broke it. * ADD the ability to run the Travis build matrix for OSX as well, but leave it commented out by default (because it takes roughly ten times longer, due to a shortage of OSX build machines). * ADD Travis config option to cancel/fail the build early if one target has already failed ("fast_finish: true"). * ADD comments to describe what our Travis config is doing and why it is configured that way.
[0]: https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages...) --- .travis.yml | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml index cd520748e..8e0bb2afe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,89 @@ language: c -sudo: enabled + +compiler: + - gcc + - clang + +notifications: + irc: + channels: + - "irc.oftc.net#tor-bots" + template: + - "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}" + - "Build #%{build_number} %{result}. Details: %{build_url}" + on_success: change + on_failure: change + email: + on_success: never + on_failure: change + +os: + - linux + ## Uncomment the following line to also run the entire build matrix on OSX. + ## This will make your CI builds take roughly ten times longer to finish. + # - osx + +## Use the Ubuntu Trusty images. 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.) +sudo: false + +## (Linux only) Download our dependencies +addons: + apt: + packages: + - libevent-dev + - libseccomp2 + - zlib1g-dev + +## The build matrix in the following two stanzas expands into four builds (per OS): +## +## * with GCC, with Rust +## * with GCC, without Rust +## * with Clang, with Rust +## * with Clang, without Rust +env: + global: + ## The Travis CI environment allows us two cores, so let's use both. + - MAKEFLAGS="-j 2" + matrix: + - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + - RUST_OPTIONS="" + +matrix: + ## If one build in the matrix fails (e.g. if building withour Rust and Clang + ## fails, but building with Rust and GCC is still going), then cancel the + ## entire job early and call the whole thing a failure. + fast_finish: true + before_install: - - sudo apt-get -qq update - - sudo apt-get -y install libevent-dev libseccomp2 zlib1g-dev - - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable + ## If we're on OSX, homebrew usually needs to updated first + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi + ## Download rustup + - curl -Ssf -o rustup.sh https://sh.rustup.rs + +install: + ## If we're on OSX use brew to install dependencies (for Linux, see the "apt:" section above) + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl || brew upgrade openssl; }; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl || brew upgrade libevent; }; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl || brew upgrade pkg-config; }; fi + ## Install the nightly channels of rustc and cargo and setup our toolchain environment + - sh rustup.sh -y --default-toolchain nightly + - source $HOME/.cargo/env + ## Get some info about rustc and cargo + - which rustc + - which cargo + - rustc --version + - cargo --version + +script: + - ./autogen.sh + - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules + ## We run `make check` because that's what https://jenkins.torproject.org does. + - make check
-script: ./autogen.sh && ./configure --disable-asciidoc && make test +after_failure: + ## `make check` will leave a log file with more details of test failures. + - cat test-suite.log