diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 104 |
1 files changed, 66 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml index ad633e46a0..b5713d6933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,11 +33,8 @@ env: ## We don't list default variable values, because we set the defaults ## in global (or the default is unset) - - ## We turn off hardening for Rust builds, because they are incompatible, - ## 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="" + ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 + - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: ## include creates builds with gcc, linux, sudo: false @@ -50,12 +47,15 @@ matrix: # - 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 - ## But without hardening (see above) - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" - ## Check disable module dirauth with rust, and without rust but with distcheck - - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" - - env: DISTCHECK="yes" MODULES_OPTIONS="--disable-module-dirauth" + # We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" + ## Check rust online with distcheck, to make sure we remove rust products + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + ## Check disable module dirauth with and without rust + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## Check NSS + - env: NSS_OPTIONS="--enable-nss" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -72,9 +72,23 @@ matrix: ## 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" 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.) @@ -93,26 +107,53 @@ sudo: ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty -## (Linux only) Download our dependencies +## Download our dependencies addons: + ## (Linux only) apt: packages: ## Required dependencies - libevent-dev + ## Ubuntu comes with OpenSSL by default + #- libssl-dev - zlib1g-dev ## Optional dependencies - libcap-dev - liblzma-dev + - libnss3-dev - libscrypt-dev - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd - ## Conditional dependencies + ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl - docbook-xml - xmlto + ## (OSX only) + homebrew: + packages: + ## Required dependencies + - libevent + ## The OSX version of OpenSSL is way too old + - openssl + ## OSX comes with zlib by default + ## to use a newer zlib, pass the keg path to configure (like OpenSSL) + #- zlib + ## Optional dependencies + - libscrypt + - xz + - zstd + ## Required build dependencies + ## Tor needs pkg-config to find some dependencies at build time + - pkg-config + ## Optional build dependencies + - ccache + ## Conditional build dependencies + ## Always installed, because manual brew installs are hard to get right + - asciidoc + - xmlto ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version @@ -120,43 +161,27 @@ addons: #osx_image: xcode9.4 before_install: - ## If we're on OSX, homebrew usually needs to be updated first - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## We might be upgrading some useless packages, but that's better than missing an upgrade - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi ## Create empty rust directories for non-Rust builds, so caching succeeds - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi install: - ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi - ## macOS comes with zlib by default, so the homebrew install is keg-only - # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi - ## If we're on OSX also install the optional dependencies - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi - ## If we're on OSX, and using asciidoc, install asciidoc - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi ## If we're using Rust, download rustup - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi - ## Install the stable channels of rustc and cargo and setup our toolchain environment - - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi + ## Install the nightly channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi ## If we're testing rust builds in offline-mode, then set up our vendored dependencies - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi + - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi @@ -168,15 +193,17 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi + - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: ## configure will leave a log file with more details of config failures. @@ -186,6 +213,7 @@ after_failure: - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi after_success: ## If this build was one that produced coverage, upload it. |