From e586bb36abd1ec4bcefa3d9b7ad9185891991bb8 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 12 Jun 2026 10:27:23 +0800 Subject: [PATCH 1/4] Update CI config to use macos-26 where possible. --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 75b9f42..1e9a97c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ concurrency: jobs: config: - runs-on: macOS-latest + runs-on: macOS-26 outputs: PYTHON_VER: ${{ steps.extract.outputs.PYTHON_VER }} PYTHON_VERSION: ${{ steps.extract.outputs.PYTHON_VERSION }} @@ -90,7 +90,7 @@ jobs: echo "ZSTD_VERSION=${ZSTD_VERSION}" | tee -a ${GITHUB_OUTPUT} build: - runs-on: macOS-15 + runs-on: macOS-26 needs: [config] strategy: fail-fast: false @@ -190,7 +190,7 @@ jobs: cpython-testbed: name: CPython testbed (${{ matrix.platform }}) - runs-on: macOS-15 + runs-on: macOS-26 needs: [config, build] strategy: fail-fast: false @@ -251,7 +251,7 @@ jobs: crossenv-test: name: Cross-platform env test (${{ matrix.multiarch }}) - runs-on: macOS-latest + runs-on: macOS-26 needs: [config, build] strategy: fail-fast: false From 00632825bdcc3779c99c36d0c0b8601c1efec373 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 12 Jun 2026 10:42:38 +0800 Subject: [PATCH 2/4] Drop the explicit Xcode selection, pick updated simulators. --- .github/workflows/ci.yaml | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1e9a97c..c6ad179 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -100,15 +100,6 @@ jobs: steps: - uses: actions/checkout@v6 - - name: Set up Xcode - # GitHub recommends explicitly selecting the desired Xcode version: - # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140 - # This became a necessity as a result of - # https://github.com/actions/runner-images/issues/12541 and - # https://github.com/actions/runner-images/issues/12751. - run: | - sudo xcode-select --switch /Applications/Xcode_16.4.app - - name: Set up Python uses: actions/setup-python@v6.2.0 with: @@ -142,7 +133,7 @@ jobs: - briefcase-run-args: - platform: iOS - briefcase-run-args: ' -d "iPhone 16e::iOS 18.5"' + briefcase-run-args: ' -d "iPhone 17e::iOS 26.4"' steps: - uses: actions/checkout@v6 @@ -198,9 +189,9 @@ jobs: platform: ["iOS", "tvOS", "visionOS"] include: - platform: "iOS" - testbed-args: '--simulator "iPhone 16e,arch=arm64,OS=18.5"' + testbed-args: '--simulator "iPhone 17e,arch=arm64,OS=26.4"' - platform: "visionOS" - testbed-args: '--simulator "Apple Vision Pro,arch=arm64,OS=2.5"' + testbed-args: '--simulator "Apple Vision Pro,arch=arm64,OS=26.4"' steps: - uses: actions/checkout@v6 @@ -212,15 +203,6 @@ jobs: path: dist merge-multiple: true - - name: Set up Xcode - # GitHub recommends explicitly selecting the desired Xcode version: - # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140 - # This became a necessity as a result of - # https://github.com/actions/runner-images/issues/12541 and - # https://github.com/actions/runner-images/issues/12751. - run: | - sudo xcode-select --switch /Applications/Xcode_16.4.app - - name: Set up Python uses: actions/setup-python@v6.2.0 with: From 2ae68839e221c9c77348b0d9d5a6806fa2bf8c41 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 12 Jun 2026 11:36:27 +0800 Subject: [PATCH 3/4] Try using macOS-26 everywhere. --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c6ad179..7938989 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -123,7 +123,7 @@ jobs: briefcase-testbed: name: Briefcase testbed (${{ matrix.platform }}) - runs-on: macOS-15 + runs-on: macOS-26 needs: [config, build] strategy: fail-fast: false From cd108f7a672096f80320219529b413f7e86970d2 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 12 Jun 2026 11:51:59 +0800 Subject: [PATCH 4/4] More config fixes. --- .github/workflows/ci.yaml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7938989..6517b2b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,15 +138,6 @@ jobs: steps: - uses: actions/checkout@v6 - - name: Set up Xcode - # GitHub recommends explicitly selecting the desired Xcode version: - # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140 - # This became a necessity as a result of - # https://github.com/actions/runner-images/issues/12541 and - # https://github.com/actions/runner-images/issues/12751. - run: | - sudo xcode-select --switch /Applications/Xcode_16.4.app - - name: Get build artifact uses: actions/download-artifact@v8.0.1 with: @@ -189,9 +180,9 @@ jobs: platform: ["iOS", "tvOS", "visionOS"] include: - platform: "iOS" - testbed-args: '--simulator "iPhone 17e,arch=arm64,OS=26.4"' + testbed-args: '--simulator "iPhone 17e,arch=arm64,OS=26.4.1"' - platform: "visionOS" - testbed-args: '--simulator "Apple Vision Pro,arch=arm64,OS=26.4"' + testbed-args: '--simulator "Apple Vision Pro,arch=arm64,OS=26.4.1"' steps: - uses: actions/checkout@v6