Unverified Commit f2f7491c authored by teor's avatar teor
Browse files

Merge branch 'ticket32629_029' into ticket32629_035

Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
parents 453e092e 99b5f1b2
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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"

changes/ticket32177

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line
  o Testing:
    - Disable all but one Travis CI macOS build, to mitigate slow scheduling
      of Travis macOS jobs. Closes ticket 32177.