Browse Source

Merge branch 'ticket32629_029' into ticket32629_035

Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
teor 4 years ago
parent
commit
f2f7491cd9
2 changed files with 2 additions and 6 deletions
  1. 2 3
      .travis.yml
  2. 0 3
      changes/ticket32177

+ 2 - 3
.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"
 

+ 0 - 3
changes/ticket32177

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