mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ticket32629_035' into ticket32629_040

Browse source
This commit is contained in:
teor 2019-12-01 20:26:51 +10:00
commit 349554f40d
No known key found for this signature in database
GPG key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -62,15 +62,16 @@ matrix:
- env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
## We check disable module dirauth ## We check disable module dirauth
- env: MODULES_OPTIONS="--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 ## 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" #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
# compiler: clang # compiler: clang
# os: osx # os: osx
## We run chutney on macOS, because macOS Travis has IPv6 ## 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"
#- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx
# os: osx
## We clone our stem repo and run `make test-stem` ## We clone our stem repo and run `make test-stem`
- env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"

3
changes/ticket32177
View file

@ -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.