commit f021389e92753e1c6bd76c1525e276e174bd897c Merge: ff5220536 c96cf1494 Author: teor teor@torproject.org Date: Thu Feb 13 13:58:13 2020 +1000

Merge branch 'bug33195_041' into bug33195_042

Conflicts: * Keep RUST_VERSION from maint-0.4.2 * Keep the commented-out allow_failure entries from bug33195_041

.travis.yml | 57 ++++++++++++++++++++++++++++++++--------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 42 insertions(+), 23 deletions(-)

diff --cc .travis.yml index 26c7b33cd,14b0e12c7..c3903fe1e --- a/.travis.yml +++ b/.travis.yml @@@ -71,14 -79,9 +81,9 @@@ matrix ## concurrent macOS jobs. We're not actively developing Rust, so it is ## the lowest priority. ## We run rust on macOS, because we have seen macOS rust failures before - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # compiler: clang # os: osx - ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx - ## We clone our stem repo and run `make test-stem` - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"

## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. @@@ -90,11 -93,17 +95,17 @@@ ## macOS rust and chutney are very slow, so we let the build finish before ## they are done. We'd like to fast finish, but still eventually show ## any failures in the build status. But Travis doesn't have that ability. - - env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + + ## Since this job is disabled, there's not much point having an exception + ## for it - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" ++ #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # compiler: clang + # os: osx + + ## Since we're actively developing IPv6, we want to require the IPv6 + ## chutney tests + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx

## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic