From f3c7b9c2229ce7003f30445a6e37cd215ec4c783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Aug 2025 20:43:58 +0000 Subject: [PATCH 1/3] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 12 ++++++------ .github/workflows/publish.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 36edb3b..cf58b92 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -56,7 +56,7 @@ jobs: XZ_VERSION: ${{ steps.extract.outputs.XZ_VERSION }} steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v5 - name: Extract config variables id: extract @@ -92,7 +92,7 @@ jobs: platform: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS'] steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v5 - name: Set up Python uses: actions/setup-python@v5.6.0 @@ -130,7 +130,7 @@ jobs: briefcase-run-args: ' -d "iPhone SE (3rd generation)"' steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v5 - name: Get build artifact uses: actions/download-artifact@v5.0.0 @@ -149,7 +149,7 @@ jobs: # It's an edge case, but when a new alpha is released, we need to use it ASAP. check-latest: true - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v5 with: repository: beeware/Python-support-testbed path: Python-support-testbed @@ -174,7 +174,7 @@ jobs: platform: ["iOS", "visionOS"] steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v5 - name: Get build artifact uses: actions/download-artifact@v5.0.0 @@ -230,7 +230,7 @@ jobs: multiarch: arm64-iphoneos steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v5 - name: Get build artifact uses: actions/download-artifact@v5.0.0 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 587abe8..f913f7d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -8,7 +8,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Python environment uses: actions/setup-python@v5.6.0 From ca018fedc3d376c9fbff5270a47770e4f3c1fcc2 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 20 Aug 2025 15:30:23 +0800 Subject: [PATCH 2/3] Pin Xcode and iOS simulator versions. --- .github/workflows/ci.yaml | 44 ++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cf58b92..36b1216 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -84,7 +84,7 @@ jobs: echo "XZ_VERSION=${XZ_VERSION}" | tee -a ${GITHUB_OUTPUT} build: - runs-on: macOS-latest + runs-on: macOS-15 needs: [ config ] strategy: fail-fast: false @@ -94,6 +94,15 @@ jobs: steps: - uses: actions/checkout@v5 + - 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@v5.6.0 with: @@ -117,7 +126,7 @@ jobs: briefcase-testbed: name: Briefcase testbed (${{ matrix.platform }}) - runs-on: macOS-latest + runs-on: macOS-15 needs: [ config, build ] strategy: fail-fast: false @@ -127,11 +136,20 @@ jobs: - briefcase-run-args: - platform: iOS - briefcase-run-args: ' -d "iPhone SE (3rd generation)"' + briefcase-run-args: ' -d "iPhone 16e"::iOS 18.5"' steps: - uses: actions/checkout@v5 + - 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@v5.0.0 with: @@ -160,22 +178,34 @@ jobs: python -m pip install git+https://github.com/beeware/briefcase.git - name: Run support testbed check - timeout-minutes: 10 + timeout-minutes: 15 working-directory: Python-support-testbed run: briefcase run ${{ matrix.platform }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\' cpython-testbed: name: CPython testbed (${{ matrix.platform }}) - runs-on: macOS-latest + runs-on: macOS-15 needs: [ config, build ] strategy: fail-fast: false matrix: platform: ["iOS", "visionOS"] + include: + - platform: "iOS" + testbed-args: '--simulator "iPhone 16e,arch=arm64,OS=18.5"' steps: - uses: actions/checkout@v5 + - 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@v5.0.0 with: @@ -200,7 +230,7 @@ jobs: tar zxvf ../../../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz - name: Run CPython testbed - timeout-minutes: 10 + timeout-minutes: 15 working-directory: support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }} run: | # Run a representative subset of CPython core tests: @@ -209,7 +239,7 @@ jobs: # - test_os as a test of system library calls # - test_bz2 as a simple test of third party libraries # - test_ctypes as a test of FFI - python -m testbed run -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes + python -m testbed run ${{ matrix.testbed-args }} -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes crossenv-test: name: Cross-platform env test (${{ matrix.multiarch }}) From dca21f01a3a79ebc6924ce7e722971b29f497d5c Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 20 Aug 2025 15:51:29 +0800 Subject: [PATCH 3/3] Use macos-14 for CPython tests. --- .github/workflows/ci.yaml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 36b1216..e2782b0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -136,7 +136,7 @@ jobs: - briefcase-run-args: - platform: iOS - briefcase-run-args: ' -d "iPhone 16e"::iOS 18.5"' + briefcase-run-args: ' -d "iPhone 16e::iOS 18.5"' steps: - uses: actions/checkout@v5 @@ -184,7 +184,8 @@ jobs: cpython-testbed: name: CPython testbed (${{ matrix.platform }}) - runs-on: macOS-15 + # For now, CPython testbed can't run on macos-15: https://github.com/actions/runner-images/issues/12777 + runs-on: macOS-14 needs: [ config, build ] strategy: fail-fast: false @@ -197,15 +198,6 @@ jobs: steps: - uses: actions/checkout@v5 - - 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@v5.0.0 with: @@ -239,7 +231,7 @@ jobs: # - test_os as a test of system library calls # - test_bz2 as a simple test of third party libraries # - test_ctypes as a test of FFI - python -m testbed run ${{ matrix.testbed-args }} -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes + python -m testbed run -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes crossenv-test: name: Cross-platform env test (${{ matrix.multiarch }})