Unverified Commit 8f84999f authored by teor's avatar teor
Browse files

Merge branch 'ticket32177_041' into ticket32177_042 

Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build
from ticket32177_041.
parents 7a35c8d8 86b17147

.travis.yml

+7 −5
Original line number Diff line number Diff line
@@ -57,12 +57,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_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"

      compiler: clang

      os: osx

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

    #- env: RUST_VERSION="nightly" 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"

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.