diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:15:46 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:15:46 +1000 |
| commit | 95caab8cc6962066a20390282afdd70ba6e6ec2b (patch) | |
| tree | 45b37b23c273c5fc321cab918bcd13fa380f45bc /.travis.yml | |
| parent | e49ec773d1572eed2f02f83bba61d6383810d0a1 (diff) | |
| parent | 7dd59460941c50242e740ff0cbd84b588d66e26e (diff) | |
| download | tor-95caab8cc6962066a20390282afdd70ba6e6ec2b.tar.gz tor-95caab8cc6962066a20390282afdd70ba6e6ec2b.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 51368ea512..6004727b6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,9 +49,8 @@ matrix: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## 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 ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. |