From f8d574daa43eb8d73634167a9ff845e746de7399 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 15 Aug 2025 08:41:04 +0800 Subject: [PATCH 1/4] Revert docformatter to 1.7.7. --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 187fe9e..736478f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/PyCQA/docformatter - rev: v1.7.8-rc1 + rev: v1.7.7 hooks: - id: docformatter args: [--in-place, --black] From 0767dde185f84af7a4bb37a04ba81028c8683652 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 15 Aug 2025 09:11:50 +0800 Subject: [PATCH 2/4] Correct for GitHub Actions macos-15 image changes. --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4b47d6..54128bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - backend: iOS runs-on: macos-latest briefcase-target: "iOS" - briefcase-run-args: ' -d "iPhone SE (3rd generation)"' + briefcase-run-args: ' -d "iPhone SE (3rd generation):iOS 18.5"' - backend: android runs-on: ubuntu-latest @@ -124,6 +124,16 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true + - name: Prepare macOS + # 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. + if: matrix.runs-on == 'macos-latest' + run: | + sudo xcode-select --switch /Applications/Xcode_16.5.app + - name: Install Dependencies run: ${{ matrix.pre-command }} From 1bb3c9b7a7df7532607d6188cf5b01f7e7cf2441 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 15 Aug 2025 09:15:13 +0800 Subject: [PATCH 3/4] Use an Xcode version that exists. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54128bd..baa76f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: # https://github.com/actions/runner-images/issues/12751. if: matrix.runs-on == 'macos-latest' run: | - sudo xcode-select --switch /Applications/Xcode_16.5.app + sudo xcode-select --switch /Applications/Xcode_16.4.app - name: Install Dependencies run: ${{ matrix.pre-command }} From ae755ceea222e2e2218b02b2bd0c06017f062f25 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 15 Aug 2025 09:25:19 +0800 Subject: [PATCH 4/4] ...and use a syntax that is legal. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baa76f3..03705e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - backend: iOS runs-on: macos-latest briefcase-target: "iOS" - briefcase-run-args: ' -d "iPhone SE (3rd generation):iOS 18.5"' + briefcase-run-args: ' -d "iPhone SE (3rd generation)::iOS 18.5"' - backend: android runs-on: ubuntu-latest