torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ticket32177_041' into ticket32177_042

Browse Source 
Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build
from ticket32177_041.
This commit is contained in:
teor
2019-10-22 19:44:58 +10:00
parent 7a35c8d8be 86b1714731
commit 8f84999f58
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+7 -5
View File
@@ -57,12 +57,14 @@ matrix:
## We check disable module dirauth
- env: MODULES_OPTIONS="--disable-module-dirauth"
## We run rust on macOS, because we have seen macOS rust failures before
- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
compiler: clang
os: osx
# 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
- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
os: osx
# Disabled due to slow Travis macOS builds, see #32177
#- 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"
changes/ticket32177
+3
View File
@@ -0,0 +1,3 @@
o Testing:
- Disable all but one Travis CI macOS build, to mitigate slow scheduling
of Travis macOS jobs. Closes ticket 32177.