summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index aee59ed268..f007838a90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,6 +65,8 @@ matrix:
- env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
## We check asciidoc with distcheck, to make sure we remove doc products
- env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
+ ## We check disable module relay
+ - env: MODULES_OPTIONS="--disable-module-relay"
## We check disable module dirauth
- env: MODULES_OPTIONS="--disable-module-dirauth"
## macOS builds are very slow, and we have a limited number of
@@ -119,6 +121,8 @@ addons:
- libseccomp-dev
## zstd doesn't exist in Ubuntu Trusty
#- libzstd
+ ## Optional build dependencies
+ - coccinelle
- shellcheck
## Conditional build dependencies
## Always installed, so we don't need sudo
@@ -148,6 +152,7 @@ addons:
- pkg-config
## Optional build dependencies
- ccache
+ - coccinelle
- shellcheck
## Conditional build dependencies
## Always installed, because manual brew installs are hard to get right
@@ -164,6 +169,8 @@ addons:
osx_image: xcode11.2
before_install:
+ ## Set pipefail: we use pipes
+ - set -o pipefail || echo "pipefail failed"
## 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
@@ -205,6 +212,9 @@ install:
- if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi
## If we're running stem, show the stem version and commit
- if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi
+ ## Get the coccinelle version
+ ## Installs are unreliable on macOS, so we just rely on brew list --versions
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then spatch --version; fi
## We don't want Tor tests to depend on default configuration file at
## ~/.torrc. So we put some random bytes in there, to make sure we get build
## failures in case Tor is reading it during CI jobs.