From 9e10fe68b0ba501bb7974b41807bcedffe79a6dc Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 12 Nov 2023 15:33:12 -0800 Subject: [PATCH 1/3] .github/workflows/ci-macos.yml: Build following stages even when some of the jobs failed --- .github/workflows/ci-macos.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 2d101f7878a..9d2c70cbb78 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -40,30 +40,35 @@ jobs: with: stage: "2" needs: [stage-1] + if: ${{ success() || failure() }} stage-2-optional-0-o: uses: ./.github/workflows/macos.yml with: stage: "2-optional-0-o" needs: [stage-2] + if: ${{ success() || failure() }} stage-2-optional-p-z: uses: ./.github/workflows/macos.yml with: stage: "2-optional-p-z" needs: [stage-2-optional-0-o] + if: ${{ success() || failure() }} stage-2-experimental-0-o: uses: ./.github/workflows/macos.yml with: stage: "2-optional-0-o" needs: [stage-2-optional-p-z] + if: ${{ success() || failure() }} stage-2-experimental-p-z: uses: ./.github/workflows/macos.yml with: stage: "2-experimental-p-z" needs: [stage-2-experimental-0-o] + if: ${{ success() || failure() }} dist: From 4680d85b291d84727c96c093d5308b491e4869c9 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 12 Nov 2023 20:11:03 -0800 Subject: [PATCH 2/3] .github/workflows/macos.yml: Replace homebrew-macos-11-xcode_13.2.1-standard by -minimal, to avoid problem with maxima --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 91c38807e76..df49a79fb32 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,7 +23,7 @@ on: default: >- [["latest", "", "homebrew-macos-usrlocal-minimal"], ["latest", "", "homebrew-macos-usrlocal-standard"], - ["11", "xcode_13.2.1", "homebrew-macos-usrlocal-standard"], + ["11", "xcode_13.2.1", "homebrew-macos-usrlocal-minimal], ["12", "", "homebrew-macos-usrlocal-standard"], ["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"], ["latest", "", "homebrew-macos-usrlocal-maximal"], From a933ae23f96b9ef8a3530e517d8fc3849662255d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 12 Nov 2023 20:11:58 -0800 Subject: [PATCH 3/3] .github/workflows/macos.yml (conda-forge-macos-maximal): Remove, to avoid problems with optional conda packages --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index df49a79fb32..34483ed3d22 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -29,8 +29,7 @@ on: ["latest", "", "homebrew-macos-usrlocal-maximal"], ["latest", "", "homebrew-macos-usrlocal-python3_xcode-standard"], ["latest", "", "conda-forge-macos-minimal"], - ["latest", "", "conda-forge-macos-standard"], - ["latest", "", "conda-forge-macos-maximal"]] + ["latest", "", "conda-forge-macos-standard"]] type: string extra_sage_packages: description: 'Extra Sage packages to install as system packages'