diff options
| author | teor <teor@torproject.org> | 2019-10-25 16:14:37 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-25 16:14:37 +1000 |
| commit | f40eb2ead6f166f3f478eabe8766856056169a5a (patch) | |
| tree | baf6886ab6c16ac76e9fcfe64477a31813086aa4 /.travis.yml | |
| parent | aff286618c1c0f76796f10004e0834896470aa61 (diff) | |
| parent | 7a5eefd3f8443a41c40bda363105965909bcec9b (diff) | |
| download | tor-f40eb2ead6f166f3f478eabe8766856056169a5a.tar.gz tor-f40eb2ead6f166f3f478eabe8766856056169a5a.zip | |
Merge remote-tracking branch 'tor-github/pr/1462'
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index eda8d17bc5..ea06d21db5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,6 +117,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 @@ -146,6 +148,7 @@ addons: - pkg-config ## Optional build dependencies - ccache + - coccinelle - shellcheck ## Conditional build dependencies ## Always installed, because manual brew installs are hard to get right @@ -202,6 +205,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. |