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

Merge branch 'ticket32629_029' into ticket32629_035

Browse Source 
Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
This commit is contained in:
teor 2019-11-28 12:21:08 +10:00
commit f2f7491cd9
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -67,9 +67,8 @@ matrix:
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"

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.