nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.2'

Browse Source
This commit is contained in:
teor 2019-12-16 08:16:28 +10:00
commit 5082eeba38
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -70,15 +70,16 @@ matrix:
- env: MODULES_OPTIONS="--disable-module-relay" - env: MODULES_OPTIONS="--disable-module-relay"
## 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_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" #- env: RUST_VERSION="nightly" 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"

4
changes/ticket32629 Normal file
View File

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