From 69b3a5b7da866823ba04b086e4744ebbe07cfded Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 20 Oct 2022 18:31:39 +0100 Subject: [PATCH 1/4] Build wheels on macos 11, not 10.15 10.15 is end-of-life as of ~5 weeks ago https://endoflife.date/macos --- .github/workflows/release-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 60db6ad7f09d..0601a7dbaf15 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -99,7 +99,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-10.15] + os: [ubuntu-20.04, macos-11] arch: [x86_64, aarch64] # is_pr is a flag used to exclude certain jobs from the matrix on PRs. # It is not read by the rest of the workflow. @@ -109,9 +109,9 @@ jobs: exclude: # Don't build macos wheels on PR CI. - is_pr: true - os: "macos-10.15" + os: "macos-11" # Don't build aarch64 wheels on mac. - - os: "macos-10.15" + - os: "macos-11" arch: aarch64 # Don't build aarch64 wheels on PR CI. - is_pr: true From b5454aec3263b40397d64c4b470974c58a585509 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 20 Oct 2022 18:35:10 +0100 Subject: [PATCH 2/4] Changelog --- changelog.d/14249.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/14249.misc diff --git a/changelog.d/14249.misc b/changelog.d/14249.misc new file mode 100644 index 000000000000..3a2ce1e0c2a3 --- /dev/null +++ b/changelog.d/14249.misc @@ -0,0 +1 @@ +Build wheels on macos 11, not 10.15. From 6330c7045801b273d271b477b60b1ec698fdf30b Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 20 Oct 2022 18:35:57 +0100 Subject: [PATCH 3/4] [DO NOT MERGE] build mac wheels on pr ci --- .github/workflows/release-artifacts.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 0601a7dbaf15..adcf0bfb9a69 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -107,9 +107,9 @@ jobs: - ${{ startsWith(github.ref, 'refs/pull/') }} exclude: - # Don't build macos wheels on PR CI. - - is_pr: true - os: "macos-11" +# # Don't build macos wheels on PR CI. +# - is_pr: true +# os: "macos-11" # Don't build aarch64 wheels on mac. - os: "macos-11" arch: aarch64 @@ -139,9 +139,9 @@ jobs: if: matrix.arch == 'aarch64' run: echo 'CIBW_ARCHS_LINUX=aarch64' >> $GITHUB_ENV - - name: Only build a single wheel on PR - if: startsWith(github.ref, 'refs/pull/') - run: echo "CIBW_BUILD="cp37-manylinux_${{ matrix.arch }}"" >> $GITHUB_ENV +# - name: Only build a single wheel on PR +# if: startsWith(github.ref, 'refs/pull/') +# run: echo "CIBW_BUILD="cp37-manylinux_${{ matrix.arch }}"" >> $GITHUB_ENV - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse From 3d4e612c373a9f30bfa149b16b4dfc8c6c6cd2be Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 20 Oct 2022 22:25:35 +0100 Subject: [PATCH 4/4] Revert "[DO NOT MERGE] build mac wheels on pr ci" This reverts commit 6330c7045801b273d271b477b60b1ec698fdf30b. --- .github/workflows/release-artifacts.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index adcf0bfb9a69..0601a7dbaf15 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -107,9 +107,9 @@ jobs: - ${{ startsWith(github.ref, 'refs/pull/') }} exclude: -# # Don't build macos wheels on PR CI. -# - is_pr: true -# os: "macos-11" + # Don't build macos wheels on PR CI. + - is_pr: true + os: "macos-11" # Don't build aarch64 wheels on mac. - os: "macos-11" arch: aarch64 @@ -139,9 +139,9 @@ jobs: if: matrix.arch == 'aarch64' run: echo 'CIBW_ARCHS_LINUX=aarch64' >> $GITHUB_ENV -# - name: Only build a single wheel on PR -# if: startsWith(github.ref, 'refs/pull/') -# run: echo "CIBW_BUILD="cp37-manylinux_${{ matrix.arch }}"" >> $GITHUB_ENV + - name: Only build a single wheel on PR + if: startsWith(github.ref, 'refs/pull/') + run: echo "CIBW_BUILD="cp37-manylinux_${{ matrix.arch }}"" >> $GITHUB_ENV - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse