diff options
| author | teor <teor@torproject.org> | 2019-10-25 10:56:13 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-25 10:56:13 +1000 |
| commit | d7c40beeab85198a1081dca60201f5e1f265fe13 (patch) | |
| tree | 1801244df592813747da1f5857c9a27a36bbf52f /.travis.yml | |
| parent | c8aa3cc17d9cf28ea98c4619984b3f9c0afa3f3a (diff) | |
| parent | 63581d55a691e56cde121194558db8a139ab9e74 (diff) | |
| download | tor-d7c40beeab85198a1081dca60201f5e1f265fe13.tar.gz tor-d7c40beeab85198a1081dca60201f5e1f265fe13.zip | |
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index f9f13c8569..13d0db67bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,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="" TOR_TEST_RNG_SEED="636f766572616765" ## We run rust on Linux, because it's faster than rust on macOS @@ -86,8 +94,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: |