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: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 91c38807e76..34483ed3d22 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,14 +23,13 @@ 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"], ["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' diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index b5731ea41cd..84c13778972 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=6c2020ef6639a24eb777eb1fa1adfca6dbd4520c -md5=c8641bab76511afffa14c46c8a6f4c73 -cksum=1432162721 +sha1=d9f5a7031d7d76d0b1f62b434a62670771881b87 +md5=4c0ed74f54290bd7946f6015df815a01 +cksum=4159022663 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 9789b687e7f..5b603d7e0ac 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -883e05f8ee0f97b25cf28c97859c615d9ea314f7 +df198f9133172252e6333dead535c3314419696b