diff options
| author | teor <teor@torproject.org> | 2019-10-25 10:55:58 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-25 10:55:58 +1000 |
| commit | e56e7e865e148c5017ae20df12c76df0f79e60c1 (patch) | |
| tree | 002d875d36e153082347e50827b1e52bc63c5bb3 | |
| parent | 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 (diff) | |
| parent | e03db9934a0d26da0b119a2d15d51c4c658af1c8 (diff) | |
| download | tor-e56e7e865e148c5017ae20df12c76df0f79e60c1.tar.gz tor-e56e7e865e148c5017ae20df12c76df0f79e60c1.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | changes/ticket31919_bionic | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6078210c5c..0eeaecdae3 100644 --- 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="" ## 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 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. |