diff options
| author | teor <teor@torproject.org> | 2019-10-25 10:55:47 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-25 10:55:47 +1000 |
| commit | 79105b55b79ac1846a25de69c28d9f4b0e0111d1 (patch) | |
| tree | b552d6bf8072bddbff3d7b8c0fa77dafe3b4e763 | |
| parent | 62194caa0565881178a784fe7662e5c9aa6c5b56 (diff) | |
| parent | 93be7275ecb5bb3c3e2964bb5179f26e926d7f10 (diff) | |
| download | tor-79105b55b79ac1846a25de69c28d9f4b0e0111d1.tar.gz tor-79105b55b79ac1846a25de69c28d9f4b0e0111d1.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | changes/ticket31919_bionic | 5 |
2 files changed, 11 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: 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. |