diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 939f4f4e90..56d7dc0737 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,11 @@ language: c cache: ccache: true + ## cargo: true + directories: + - $HOME/.cargo + ## where we point CARGO_TARGET_DIR in all our cargo invocations + - $TRAVIS_BUILD_DIR/src/rust/target compiler: - gcc @@ -28,6 +33,12 @@ 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 + ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 + - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" matrix: ## include creates builds with gcc, linux, sudo: false @@ -36,10 +47,16 @@ matrix: - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We only want to check these build option combinations once ## (they shouldn't vary by compiler or OS) - ## We run coverage with hardening off, which seems like enough + ## We run rust and coverage with hardening off, which seems like enough # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + ## Check rust online with distcheck, to make sure we remove rust products + ## But without hardening (see above) + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" + ## Check disable module dirauth with and without rust + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: MODULES_OPTIONS="--disable-module-dirauth" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -67,6 +84,12 @@ matrix: - 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.) @@ -97,8 +120,11 @@ addons: - zlib1g-dev ## Optional dependencies - libcap-dev + - liblzma-dev - libscrypt-dev - libseccomp-dev + ## zstd doesn't exist in Ubuntu Trusty + #- libzstd ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc @@ -117,6 +143,8 @@ addons: #- zlib ## Optional dependencies - libscrypt + - xz + - zstd ## Required build dependencies ## Tor needs pkg-config to find some dependencies at build time - pkg-config @@ -132,6 +160,10 @@ addons: ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4 +before_install: + ## 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, 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 @@ -142,14 +174,28 @@ install: - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; 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 + - 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 ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi + ## Get some info about rustup, rustc and cargo + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustup; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_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. |