From 6d315598477fe3525eed7336114a2e4f590f1a01 Mon Sep 17 00:00:00 2001
From: Mike Gerasimenko <mihail@gerasimenko.me>
Date: Mon, 3 Nov 2025 21:16:03 +0100
Subject: [PATCH 1/4] Branch out test setups

---
 .github/workflows/test.yml | 32 +++++++++++++++++++++++++++-----
 Package.swift              | 14 +++++++-------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 82956c0..31ee8f9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ on:
     types: [opened, reopened]
 
 jobs:
-  test:
+  test-16-2:
     runs-on: macos-latest
     steps:
     - name: Set Xcode version 
@@ -16,12 +16,20 @@ jobs:
     - name: Run tests
       run: swift test -v
 
-  test-linux:
-    if: false
-    runs-on: ubuntu-22.04
+  test-26:
+    runs-on: macos-latest
     steps:
+    - name: Set Xcode version 
+      run: sudo xcode-select -s /Applications/Xcode_26.app
     - uses: actions/checkout@v3
-    - uses: swift-actions/setup-swift@v2
+    - name: Run tests
+      run: swift test -v
+
+  test-linux-6-1:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: SwiftyLab/setup-swift@latest
       with:
         swift-version: "6.1.0"
     - name: Get swift version
@@ -30,3 +38,17 @@ jobs:
       run: git config --global user.email "test@example.com" && git config --global user.name "Test User"
     - name: Run tests
       run: swift test -v
+
+  test-linux-6-2:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: SwiftyLab/setup-swift@latest
+      with:
+        swift-version: "6.2.0"
+    - name: Get swift version
+      run: swift --version
+    - name: Prepare Git
+      run: git config --global user.email "test@example.com" && git config --global user.name "Test User"
+    - name: Run tests
+      run: swift test -v
diff --git a/Package.swift b/Package.swift
index 2f3f80b..397262d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -33,11 +33,11 @@ let targets: [PackageDescription.Target] = [
                            "PathKit",
                            "Yams",
                            .product(name: "ArgumentParser", package: "swift-argument-parser")],
-            swiftSettings: flags,
+            swiftSettings: flags
     ),
     .target(name: "DependencyCalculator",
             dependencies: ["Workspace", "PathKit", "Git", .product(name: "Logging", package: "swift-log")],
-            swiftSettings: flags,
+            swiftSettings: flags
     ),
     .target(name: "TestConfigurator",
             dependencies: [
@@ -46,18 +46,18 @@ let targets: [PackageDescription.Target] = [
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "ArgumentParser", package: "swift-argument-parser")
             ],
-            swiftSettings: flags,
+            swiftSettings: flags
     ),
     .target(name: "Workspace",
             dependencies: ["XcodeProj", .product(name: "Logging", package: "swift-log")],
-            swiftSettings: flags,
+            swiftSettings: flags
     ),
     .target(name: "Git",
             dependencies: ["SelectiveTestShell", "PathKit", .product(name: "Logging", package: "swift-log")],
-            swiftSettings: flags,
+            swiftSettings: flags
     ),
     .target(name: "SelectiveTestShell",
-            swiftSettings: flags,
+            swiftSettings: flags
     ),
     .testTarget(
         name: "SelectiveTestingTests",
@@ -83,7 +83,7 @@ let targets: [PackageDescription.Target] = [
             ]
         ),
         dependencies: ["xcode-selective-test"]
-    ),
+    )
 ]
 
 let package = Package(

From 2759239ff8fa1d5bd667639d2388492d2bb2303e Mon Sep 17 00:00:00 2001
From: Mike Gerasimenko <mihail@gerasimenko.me>
Date: Mon, 3 Nov 2025 21:23:14 +0100
Subject: [PATCH 2/4] Use macOS 26 image

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 31ee8f9..d1998c2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
       run: swift test -v
 
   test-26:
-    runs-on: macos-latest
+    runs-on: macos-26
     steps:
     - name: Set Xcode version 
       run: sudo xcode-select -s /Applications/Xcode_26.app

From 0c0bb6a52680a7c920443e074e3eba6bd4a1f1ce Mon Sep 17 00:00:00 2001
From: Mike Gerasimenko <mihail@gerasimenko.me>
Date: Mon, 3 Nov 2025 21:25:15 +0100
Subject: [PATCH 3/4] Run CI on push

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d1998c2..e89f61d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, synchronize]
 
 jobs:
   test-16-2:

From 204b6d02aad7b3bfda1902cb6711b55fb8ee8323 Mon Sep 17 00:00:00 2001
From: Mike Gerasimenko <mihail@gerasimenko.me>
Date: Mon, 3 Nov 2025 21:26:43 +0100
Subject: [PATCH 4/4] Xcode 26

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e89f61d..f831bcd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: macos-26
     steps:
     - name: Set Xcode version 
-      run: sudo xcode-select -s /Applications/Xcode_26.app
+      run: sudo xcode-select -s /Applications/Xcode_26.0.app
     - uses: actions/checkout@v3
     - name: Run tests
       run: swift test -v