tor

commit 63581d55a691e56cde121194558db8a139ab9e74
parent 8bc65cda4423d27896dcf3060cbe4d6abcdd3438
Author: teor <teor@torproject.org>
Date:   Fri, 25 Oct 2019 10:56:06 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

Diffstat:
M
.travis.yml
 | 
12
++++++++++--
A
changes/ticket31919_bionic
 | 
5
+++++

2 files changed, 15 insertions(+), 2 deletions(-)
diff --git 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="" TOR_TEST_RNG_SEED="636f766572616765"
     ## 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:
diff --git a/changes/ticket31919_bionic 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.