From 6947ab15a33c63ab89d0cd73d37f34a41f82361e Mon Sep 17 00:00:00 2001
From: Rob Amos <Robert.Amos@anz.com>
Date: Wed, 11 Dec 2024 16:38:01 +1100
Subject: [PATCH] Update matrix of supported versions and devices

---
 .github/workflows/ios-tests.yml     | 2 +-
 .github/workflows/linux-tests.yml   | 7 +------
 .github/workflows/watchos-tests.yml | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ios-tests.yml b/.github/workflows/ios-tests.yml
index f92ffe4..db362d3 100644
--- a/.github/workflows/ios-tests.yml
+++ b/.github/workflows/ios-tests.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           set -o pipefail && \
           NSUnbufferedIO=YES \
-          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 15" \
+          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 16" \
           | xcbeautify --renderer github-actions
 
   build-ios:
diff --git a/.github/workflows/linux-tests.yml b/.github/workflows/linux-tests.yml
index 475d857..bf2b874 100644
--- a/.github/workflows/linux-tests.yml
+++ b/.github/workflows/linux-tests.yml
@@ -36,12 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         swift: [ "swift:6.0.2" ]
-        os: [ amazonlinux2, focal, jammy, rhel-ubi9, mantic, noble ]
-        exclude:
-          - swift: "swiftlang/swift:nightly-6.0"
-            os: "mantic"
-          - swift: "swiftlang/swift:nightly-6.0"
-            os: "noble"
+        os: [ amazonlinux2, focal, jammy, rhel-ubi9, noble ]
 
     container:
       image: ${{ matrix.swift }}-${{ matrix.os }}
diff --git a/.github/workflows/watchos-tests.yml b/.github/workflows/watchos-tests.yml
index 5a90fc0..a404357 100644
--- a/.github/workflows/watchos-tests.yml
+++ b/.github/workflows/watchos-tests.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           set -o pipefail && \
           NSUnbufferedIO=YES \
-          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)" \
+          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)" \
           | xcbeautify --renderer github-actions
 
   build-watchos: