From 87967590ad7dd75db7d926eded8bc643c235cd32 Mon Sep 17 00:00:00 2001 From: Worthing ~ <115107835+w-goog@users.noreply.github.com> Date: Wed, 15 Apr 2026 16:05:46 -0700 Subject: [PATCH 1/4] g-orchestrated: migrate CI runners from macos-13 to macos-14, update macOS SDK, pin Xcode 16.2 --- .github/workflows/tests.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0fc7553c3..fc9663b9d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,19 +12,21 @@ on: jobs: xcode-project-test: - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: flags: [ "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' -sdk 'iphonesimulator17.2'", - "-scheme AppAuth-macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx14.2'", - "-scheme AppAuth_macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx14.2'", + "-scheme AppAuth-macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx15.2'", + "-scheme AppAuth_macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx15.2'", "-scheme AppAuth-tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.2' -sdk 'appletvsimulator17.2'", "-scheme AppAuth_tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.2' -sdk 'appletvsimulator17.2'", "-scheme AppAuthTV -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.2' -sdk 'appletvsimulator17.2'" ] steps: - uses: actions/checkout@v3 + - name: Select Xcode + run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer - name: Run unit test targets run: | xcodebuild test \ @@ -32,7 +34,7 @@ jobs: ${{ matrix.flags }} pod-lib-lint: - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: flags: [ @@ -50,7 +52,7 @@ jobs: run: pod lib lint --verbose ${{ matrix.flags }} spm-build-test: - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - name: Build unit test target From afb299d26021c3799cfe5097a77dc6419309167e Mon Sep 17 00:00:00 2001 From: Worthing <115107835+w-goog@users.noreply.github.com> Date: Wed, 15 Apr 2026 16:35:58 -0700 Subject: [PATCH 2/4] Update tests.yml to 18.2 17.2 isn't found by default w/macos-14 --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fc9663b9d..71f1e49fb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,12 +16,12 @@ jobs: strategy: matrix: flags: [ - "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' -sdk 'iphonesimulator17.2'", + "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 15,OS=18.2' -sdk 'iphonesimulator18.2'", "-scheme AppAuth-macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx15.2'", "-scheme AppAuth_macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx15.2'", - "-scheme AppAuth-tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.2' -sdk 'appletvsimulator17.2'", - "-scheme AppAuth_tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.2' -sdk 'appletvsimulator17.2'", - "-scheme AppAuthTV -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.2' -sdk 'appletvsimulator17.2'" + "-scheme AppAuth-tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=18.2' -sdk 'appletvsimulator18.2'", + "-scheme AppAuth_tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=18.2' -sdk 'appletvsimulator18.2'", + "-scheme AppAuthTV -destination 'platform=tvOS Simulator,name=Apple TV,OS=18.2' -sdk 'appletvsimulator18.2'" ] steps: - uses: actions/checkout@v3 From aedfe148824202679f7d7df5dae8d8dad116d5d5 Mon Sep 17 00:00:00 2001 From: Worthing <115107835+w-goog@users.noreply.github.com> Date: Wed, 15 Apr 2026 16:40:18 -0700 Subject: [PATCH 3/4] Use an available iPhone --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 71f1e49fb..c7388441c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: flags: [ - "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 15,OS=18.2' -sdk 'iphonesimulator18.2'", + "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' -sdk 'iphonesimulator18.2'", "-scheme AppAuth-macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx15.2'", "-scheme AppAuth_macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx15.2'", "-scheme AppAuth-tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=18.2' -sdk 'appletvsimulator18.2'", From 64c6adeff5ff576724af901fcef1abd5c4205773 Mon Sep 17 00:00:00 2001 From: Worthing <115107835+w-goog@users.noreply.github.com> Date: Wed, 15 Apr 2026 16:43:19 -0700 Subject: [PATCH 4/4] Add comment referencing runner images. --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c7388441c..a14e3b85e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,7 @@ jobs: runs-on: macos-14 strategy: matrix: + # Check the Github runner images when updating this matrix: https://github.com/actions/runner-images/tree/main/images/macos flags: [ "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' -sdk 'iphonesimulator18.2'", "-scheme AppAuth-macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx15.2'",