diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:16:04 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:16:04 +1000 |
| commit | 748117298341de8a279f4437b6d557f0d50edb63 (patch) | |
| tree | 327c5745de2595e780f027c347cc78766c6f3a84 | |
| parent | b9504f788c9798fab2b74d4006ba9b97151d6404 (diff) | |
| parent | 1cd20ff848eab6ee7b441c5aab0578ab02a114bc (diff) | |
| download | tor-748117298341de8a279f4437b6d557f0d50edb63.tar.gz tor-748117298341de8a279f4437b6d557f0d50edb63.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | changes/ticket32177 | 3 | ||||
| -rw-r--r-- | changes/ticket32629 | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 1bb14da8ee..ffd08a4dc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,15 +66,16 @@ matrix: - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + ## macOS builds are very slow, and we have a limited number of + ## 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 - # Disabled due to slow Travis macOS builds, see #32177 #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # compiler: clang # os: osx ## We run chutney on macOS, because macOS Travis has IPv6 - # Disabled due to slow Travis macOS builds, see #32177 - #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - # os: osx + - 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" diff --git a/changes/ticket32177 b/changes/ticket32177 deleted file mode 100644 index 6d6816acde..0000000000 --- a/changes/ticket32177 +++ /dev/null @@ -1,3 +0,0 @@ - o Testing: - - Disable all but one Travis CI macOS build, to mitigate slow scheduling - of Travis macOS jobs. Closes ticket 32177. diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 0000000000..740746c572 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629. |