Unverified Commit 92ad87b8 authored by teor's avatar teor
Browse files

Merge branch 'ticket32177_029' into ticket32177_035 

Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
parents 4b8e5ea0 511aeba8

.travis.yml

+3 −2
Original line number Diff line number Diff line
@@ -57,8 +57,9 @@ matrix: 
      compiler: clang

      os: osx

    ## We run chutney on macOS, because macOS Travis has IPv6

    - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"

      os: osx

    # Disabled due to slow Travis macOS builds, see #32177

    #- 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

0 → 100644
+3 −0
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.