commit 8e549dd5629da8ada48735c36dc97f23b3d192e1 Author: teor teor@torproject.org Date: Wed Oct 23 22:31:05 2019 +1000
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. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml index d429e1537..1bb401690 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: