Browse Source

Merge branch 'maint-0.3.5' into maint-0.4.0

teor 4 years ago
parent
commit
9bb0ca122f
2 changed files with 10 additions and 5 deletions
  1. 7 5
      .travis.yml
  2. 3 0
      changes/ticket32177

+ 7 - 5
.travis.yml

@@ -53,12 +53,14 @@ matrix:
     ## We check disable module dirauth
     - env: MODULES_OPTIONS="--disable-module-dirauth"
     ## We run rust on macOS, because we have seen macOS rust failures before
-    - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
-      compiler: clang
-      os: osx
+    # Disabled due to slow Travis macOS builds, see #32177
+    #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
+    #  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"
 

+ 3 - 0
changes/ticket32177

@@ -0,0 +1,3 @@
+  o Testing:
+    - Disable all but one Travis CI macOS build, to mitigate slow scheduling
+      of Travis macOS jobs. Closes ticket 32177.