nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.2'

Browse Source
This commit is contained in:
teor 2019-10-22 20:48:26 +10:00
commit b3478a8856
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -59,12 +59,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"

3
changes/ticket32177 Normal file
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.