From 99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 28 Nov 2019 12:10:10 +1000 Subject: Revert "Travis: Disable all but one macOS build" This reverts commit 511aeba8eeb24a953228e00917f64703059a7673. --- .travis.yml | 5 ++--- changes/ticket32177 | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 changes/ticket32177 diff --git a/.travis.yml b/.travis.yml index 4ea9400b88..aad0c3c3e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,9 +45,8 @@ matrix: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## 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 ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. diff --git a/changes/ticket32177 b/changes/ticket32177 deleted file mode 100644 index 6d6816acde..0000000000 --- a/changes/ticket32177 +++ /dev/null @@ -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. -- cgit v1.2.3-54-g00ecf From 453e092e521626420fb679ad99fade0dd1c9af88 Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 28 Nov 2019 12:11:37 +1000 Subject: Revert "Travis: Disable the Rust macOS build" This reverts commit 4c4a0d50ff4fd01862b78e8cbfaabfa9e4d4ae12. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f0e785876..35c3502e87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,10 +63,9 @@ 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 - # Disabled due to slow Travis macOS builds, see #32177 - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - # compiler: clang - # os: osx + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + 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" -- cgit v1.2.3-54-g00ecf From 6558bb4460f360ee16653d9430ee00e969f3adf7 Mon Sep 17 00:00:00 2001 From: teor Date: Sun, 1 Dec 2019 20:25:00 +1000 Subject: Travis: Disable the macOS Rust job This time, we're disabling it because it's the lowest priority job. (And also slow.) Part of 32629. --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21c86ad930..bdcd94f91b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,10 +62,13 @@ matrix: - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + ## macOS builds are very slow, and we have a limited number of + ## concurrent macOS jobs. We're not actively developing Rust, so it is + ## the lowest priority. ## 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 + #- 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 -- cgit v1.2.3-54-g00ecf From b84e7715daba5bdcb20fa3f1148d2c518ea5704c Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 6 Dec 2019 10:51:05 +1000 Subject: changes: file for 32629 --- changes/ticket32629 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/ticket32629 diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 0000000000..740746c572 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629. -- cgit v1.2.3-54-g00ecf From a277f28947900fc2018f634078bf59eae166c75a Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 6 Dec 2019 10:51:05 +1000 Subject: changes: file for 32629 --- changes/ticket32629 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/ticket32629 diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 0000000000..740746c572 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629. -- cgit v1.2.3-54-g00ecf