diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:16:00 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:16:00 +1000 |
| commit | 28e708fcbc80d181367bc76553eb6a4325372bb7 (patch) | |
| tree | 311ea1bda98a879be00042243103733e2d9d9234 | |
| parent | 09a3bd1ffeedb94c2b50c11ea702b46fcba9203c (diff) | |
| parent | 1cd20ff848eab6ee7b441c5aab0578ab02a114bc (diff) | |
| download | tor-28e708fcbc80d181367bc76553eb6a4325372bb7.tar.gz tor-28e708fcbc80d181367bc76553eb6a4325372bb7.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | changes/ticket32629 | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index aeebbcbdc2..98bb8cce80 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/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. |