diff options
| author | teor <teor@torproject.org> | 2019-11-28 12:21:08 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-28 12:21:08 +1000 |
| commit | f2f7491cd9ea8a8c39b576106b44488202aa3c63 (patch) | |
| tree | 123ff2cce00f336f6b73265b022ec217f3e396cc | |
| parent | 453e092e521626420fb679ad99fade0dd1c9af88 (diff) | |
| parent | 99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d (diff) | |
| download | tor-f2f7491cd9ea8a8c39b576106b44488202aa3c63.tar.gz tor-f2f7491cd9ea8a8c39b576106b44488202aa3c63.zip | |
Merge branch 'ticket32629_029' into ticket32629_035
Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | changes/ticket32177 | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 35c3502e87..21c86ad930 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/changes/ticket32177 b/changes/ticket32177 deleted file mode 100644 index 6d6816acde..0000000000 --- a/changes/ticket32177 +++ /dev/null @@ -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. |