diff options
| author | teor <teor@torproject.org> | 2019-12-01 20:28:44 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-01 20:28:44 +1000 |
| commit | 4a157c7569c6ad5e37747852a823369b48229ef7 (patch) | |
| tree | 47f9543153369c5350e193381090b18ab31ab0ba | |
| parent | eb81704081b92738216f3fadb172f9f55b2b3201 (diff) | |
| parent | a00b9e5a86dd763e8d21958dc9022472f40a18d8 (diff) | |
| download | tor-4a157c7569c6ad5e37747852a823369b48229ef7.tar.gz tor-4a157c7569c6ad5e37747852a823369b48229ef7.zip | |
Merge branch 'ticket32629_041' into ticket32629_042
Merge RUST_VERSION from maint-0.4.2 with disabling the macOS Rust
job from ticket32629_041.
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | changes/ticket32177 | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 252da6877a..f386500b21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,15 +64,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_VERSION="nightly" 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. |