diff options
| author | teor <teor@torproject.org> | 2019-10-23 22:31:05 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-25 09:45:36 +1000 |
| commit | 8e549dd5629da8ada48735c36dc97f23b3d192e1 (patch) | |
| tree | 03556ca445c6092b7b6975f403fd7d74d82f46a0 | |
| parent | 8682442c7629c2ede5198a00ab1cf8f4e21991d6 (diff) | |
| download | tor-8e549dd5629da8ada48735c36dc97f23b3d192e1.tar.gz tor-8e549dd5629da8ada48735c36dc97f23b3d192e1.zip | |
Travis: Use Ubuntu Bionic, but keep Trusty for chutney
Bionic has a recent coccinelle version, which passes our CI tests.
But Bionic (and Xenial) cause permissions errors for chutney.
We'll fix those in 32240.
Part of 31919.
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d429e15371..1bb401690a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,10 @@ matrix: os: osx ## 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" @@ -58,8 +62,8 @@ matrix: - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx -## (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: |