From 8e549dd5629da8ada48735c36dc97f23b3d192e1 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Wed, 23 Oct 2019 22:31:05 +1000
Subject: [PATCH 1/2] 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 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:

From 93be7275ecb5bb3c3e2964bb5179f26e926d7f10 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Fri, 25 Oct 2019 09:53:11 +1000
Subject: [PATCH 2/2] changes: file for 31919's bionic Travis image change

---
 changes/ticket31919_bionic | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changes/ticket31919_bionic

diff --git a/changes/ticket31919_bionic b/changes/ticket31919_bionic
new file mode 100644
index 0000000000..eb41644555
--- /dev/null
+++ b/changes/ticket31919_bionic
@@ -0,0 +1,5 @@
+  o Minor features (continuous integration):
+    - Use Ubuntu Bionic images for our Travis CI builds, so we can get
+      a recent version of coccinelle. But leave chutney on Ubuntu Trusty,
+      until we can fix some Bionic permissions issues (see ticket 32240).
+      Related to ticket 31919.