diff options
| author | teor <teor@torproject.org> | 2019-10-25 09:48:14 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-25 09:48:14 +1000 |
| commit | 1eb57b20b943caa4ee0a5aaefcd8c732eee950b3 (patch) | |
| tree | 4eadf48e67737df05bc2f935392932296ee16e20 | |
| parent | d175e70817ccff01cd9eb73d8da9e306745fb469 (diff) | |
| parent | 8e549dd5629da8ada48735c36dc97f23b3d192e1 (diff) | |
| download | tor-1eb57b20b943caa4ee0a5aaefcd8c732eee950b3.tar.gz tor-1eb57b20b943caa4ee0a5aaefcd8c732eee950b3.zip | |
Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8f7e8e4be1..4ded5e25a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,14 @@ matrix: compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## (Linux only) Use an older Linux image (Ubuntu Trusty) + ## The Xenial and Bionic images cause permissions issues for chutney, + ## this is a workaround, until we fix #32240. + dist: trusty + ## We check asciidoc with distcheck, to make sure we remove doc products + ## We use Linux clang, because there are no other Linux clang jobs + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + compiler: clang ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We run rust on Linux, because it's faster than rust on macOS @@ -84,8 +92,8 @@ matrix: ## test-stem sometimes hangs on Travis - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" -## (Linux only) Use the latest Linux image (Ubuntu Trusty) -dist: trusty +## (Linux only) Use a recent Linux image (Ubuntu Bionic) +dist: bionic ## Download our dependencies addons: |