From fb88683814ec1831e633aeb2273828fcbbdaaed0 Mon Sep 17 00:00:00 2001
From: Brandon Page <bpage@salesforce.com>
Date: Fri, 12 Sep 2025 17:56:41 -0700
Subject: [PATCH] iOS 26 CI

---
 .github/workflows/nightly.yaml           | 26 +++++++++++-------------
 .github/workflows/pr.yaml                | 22 ++++++++------------
 .github/workflows/reusable-workflow.yaml |  7 +++++--
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 0262412..fde912e 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -12,20 +12,19 @@ jobs:
       fail-fast: false
       matrix:
         lib: [SalesforceFileLogger, SalesforceHybridSDK]
+        ios: [^26, ^18, ^17]
         include:
-          - macos: macos-15
-            ios: ^18
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
+            xcode: ^16
+          - ios: ^17
             xcode: ^16
-          # - macos: macos-15
-          #   ios: ^26
-          #   xcode: ^26
-          # Note: iOS 26 simulator is not yet available on GitHub runners
     uses: ./.github/workflows/reusable-workflow.yaml
     with:
       lib: ${{ matrix.lib }}
       ios: ${{ matrix.ios }}
       xcode: ${{ matrix.xcode }}
-      macos: ${{ matrix.macos }}
     secrets: inherit
 
   hybrid-samples-nightly:
@@ -33,19 +32,18 @@ jobs:
       fail-fast: false
       matrix:
         lib: [AccountEditor, MobileSyncExplorerHybrid]
+        ios: [^26, ^18, ^17]
         include:
-          - macos: macos-15
-            ios: ^18
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
+            xcode: ^16
+          - ios: ^17
             xcode: ^16
-          # - macos: macos-15
-          #   ios: ^26
-          #   xcode: ^26
-          # Note: iOS 26 simulator is not yet available on GitHub runners
     uses: ./.github/workflows/reusable-workflow.yaml
     with:
       lib: ${{ matrix.lib }}
       ios: ${{ matrix.ios }}
       xcode: ${{ matrix.xcode }}
-      macos: ${{ matrix.macos }}
       action: build
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index cc4f1aa..8feaf76 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   static-analysis:
-    runs-on: macos-15
+    runs-on: macos-26
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
     steps:
@@ -58,14 +58,12 @@ jobs:
       fail-fast: false
       matrix:
         lib: [SalesforceFileLogger, SalesforceHybridSDK]
+        ios: [^26, ^18]
         include:
-          - macos: macos-15
-            ios: ^18
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
             xcode: ^16
-          # - macos: macos-15
-          #   ios: ^26
-          #   xcode: ^26
-          # Note: iOS 26 simulator is not yet available on GitHub runners
     uses: ./.github/workflows/reusable-workflow.yaml
     with:
       lib: ${{ matrix.lib }}
@@ -81,14 +79,12 @@ jobs:
       fail-fast: false
       matrix:
         lib: [AccountEditor, MobileSyncExplorerHybrid]
+        ios: [^26, ^18]
         include:
-          - macos: macos-15
-            ios: ^18
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
             xcode: ^16
-          # - macos: macos-15
-          #   ios: ^26
-          #   xcode: ^26
-          # Note: iOS 26 simulator is not yet available on GitHub runners
     uses: ./.github/workflows/reusable-workflow.yaml
     with:
       lib: ${{ matrix.lib }}
diff --git a/.github/workflows/reusable-workflow.yaml b/.github/workflows/reusable-workflow.yaml
index 5bf5060..e79f186 100644
--- a/.github/workflows/reusable-workflow.yaml
+++ b/.github/workflows/reusable-workflow.yaml
@@ -13,7 +13,7 @@ on:
         required: false
         type: string
       macos:
-        default: macos-15
+        default: macos-26
         required: false
         type: string
       is_pr:
@@ -42,6 +42,9 @@ jobs:
         run: |
           ./install.sh
           echo $TEST_CREDENTIALS > ./shared/test/test_credentials.json
+      - name: Install iOS 17 runtime if needed
+        if: ${{ inputs.ios == '^17' }}
+        run: xcodes runtimes install "iOS 17.5"
       - uses: mxcl/xcodebuild@v3
         with:
           xcode: ${{ inputs.xcode }}
@@ -59,7 +62,7 @@ jobs:
           show-code-coverage: false
           upload-bundles: false
           show-passed-tests: false
-        if: (success() || failure()) && inputs.action == 'test'
+        if: (success() || failure()) && inputs.action == 'test' && ${{ inputs.ios != '^26' }}
       - uses: codecov/codecov-action@v4
         with:
           flags: ${{ inputs.lib }}