From 6e026cf7c54cc1c8a4151572407f197b9dbeab55 Mon Sep 17 00:00:00 2001
From: Konrad Malawski <ktoso@apple.com>
Date: Wed, 17 Dec 2025 16:49:45 +0900
Subject: [PATCH 1/2] pin swift 6.2.2 on macos

---
 .github/workflows/pull_request.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index a0f2eda5f..11fc9e1ee 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        swift_version: ['6.2']
+        swift_version: ['6.2.2']
         os_version: ['macos']
         jdk_vendor: ['corretto']
     env:
@@ -162,7 +162,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ['6.2']
+        swift_version: ['6.2.2']
         os_version: ['macos']
         jdk_vendor: ['corretto']
     env:
@@ -234,7 +234,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ['6.2']  # no nightly testing on macOS
+        swift_version: ['6.2.2']  # no nightly testing on macOS
         os_version: ['macos']
         jdk_vendor: ['corretto']
         sample_app: [  # TODO: use a reusable-workflow to generate those names

From 748026ec7b82070446f4130b2c723e4ff7e177dd Mon Sep 17 00:00:00 2001
From: Konrad Malawski <ktoso@apple.com>
Date: Thu, 18 Dec 2025 10:24:49 +0900
Subject: [PATCH 2/2] move to tahoe

---
 .github/workflows/pull_request.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 11fc9e1ee..7c6b522b3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -70,7 +70,7 @@ jobs:
 
   test-java-macos:
     name: Test (Java) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
-    runs-on: [self-hosted, macos, sequoia, ARM64]
+    runs-on: [self-hosted, macos, tahoe, ARM64]
     strategy:
       fail-fast: true
       matrix:
@@ -158,7 +158,7 @@ jobs:
 
   test-swift-macos:
     name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
-    runs-on: [self-hosted, macos, sequoia, ARM64]
+    runs-on: [self-hosted, macos, tahoe, ARM64]
     strategy:
       fail-fast: false
       matrix:
@@ -230,7 +230,7 @@ jobs:
 
   verify-samples-macos:
     name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
-    runs-on: [self-hosted, macos, sequoia, ARM64]
+    runs-on: [self-hosted, macos, tahoe, ARM64]
     strategy:
       fail-fast: false
       matrix: