Skip to content

Commit 981af59

Browse files
authored
Merge pull request #279 from brandonpage/ios-26-github-actions
iOS 26 CI
2 parents 33705d9 + fb88683 commit 981af59

File tree

3 files changed

+26
-29
lines changed

3 files changed

+26
-29
lines changed

.github/workflows/nightly.yaml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,38 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
lib: [SalesforceFileLogger, SalesforceHybridSDK]
15+
ios: [^26, ^18, ^17]
1516
include:
16-
- macos: macos-15
17-
ios: ^18
17+
- ios: ^26
18+
xcode: ^26
19+
- ios: ^18
20+
xcode: ^16
21+
- ios: ^17
1822
xcode: ^16
19-
# - macos: macos-15
20-
# ios: ^26
21-
# xcode: ^26
22-
# Note: iOS 26 simulator is not yet available on GitHub runners
2323
uses: ./.github/workflows/reusable-workflow.yaml
2424
with:
2525
lib: ${{ matrix.lib }}
2626
ios: ${{ matrix.ios }}
2727
xcode: ${{ matrix.xcode }}
28-
macos: ${{ matrix.macos }}
2928
secrets: inherit
3029

3130
hybrid-samples-nightly:
3231
strategy:
3332
fail-fast: false
3433
matrix:
3534
lib: [AccountEditor, MobileSyncExplorerHybrid]
35+
ios: [^26, ^18, ^17]
3636
include:
37-
- macos: macos-15
38-
ios: ^18
37+
- ios: ^26
38+
xcode: ^26
39+
- ios: ^18
40+
xcode: ^16
41+
- ios: ^17
3942
xcode: ^16
40-
# - macos: macos-15
41-
# ios: ^26
42-
# xcode: ^26
43-
# Note: iOS 26 simulator is not yet available on GitHub runners
4443
uses: ./.github/workflows/reusable-workflow.yaml
4544
with:
4645
lib: ${{ matrix.lib }}
4746
ios: ${{ matrix.ios }}
4847
xcode: ${{ matrix.xcode }}
49-
macos: ${{ matrix.macos }}
5048
action: build
5149
secrets: inherit

.github/workflows/pr.yaml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
static-analysis:
9-
runs-on: macos-15
9+
runs-on: macos-26
1010
env:
1111
BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
1212
steps:
@@ -58,14 +58,12 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
lib: [SalesforceFileLogger, SalesforceHybridSDK]
61+
ios: [^26, ^18]
6162
include:
62-
- macos: macos-15
63-
ios: ^18
63+
- ios: ^26
64+
xcode: ^26
65+
- ios: ^18
6466
xcode: ^16
65-
# - macos: macos-15
66-
# ios: ^26
67-
# xcode: ^26
68-
# Note: iOS 26 simulator is not yet available on GitHub runners
6967
uses: ./.github/workflows/reusable-workflow.yaml
7068
with:
7169
lib: ${{ matrix.lib }}
@@ -81,14 +79,12 @@ jobs:
8179
fail-fast: false
8280
matrix:
8381
lib: [AccountEditor, MobileSyncExplorerHybrid]
82+
ios: [^26, ^18]
8483
include:
85-
- macos: macos-15
86-
ios: ^18
84+
- ios: ^26
85+
xcode: ^26
86+
- ios: ^18
8787
xcode: ^16
88-
# - macos: macos-15
89-
# ios: ^26
90-
# xcode: ^26
91-
# Note: iOS 26 simulator is not yet available on GitHub runners
9288
uses: ./.github/workflows/reusable-workflow.yaml
9389
with:
9490
lib: ${{ matrix.lib }}

.github/workflows/reusable-workflow.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
required: false
1414
type: string
1515
macos:
16-
default: macos-15
16+
default: macos-26
1717
required: false
1818
type: string
1919
is_pr:
@@ -42,6 +42,9 @@ jobs:
4242
run: |
4343
./install.sh
4444
echo $TEST_CREDENTIALS > ./shared/test/test_credentials.json
45+
- name: Install iOS 17 runtime if needed
46+
if: ${{ inputs.ios == '^17' }}
47+
run: xcodes runtimes install "iOS 17.5"
4548
- uses: mxcl/xcodebuild@v3
4649
with:
4750
xcode: ${{ inputs.xcode }}
@@ -59,7 +62,7 @@ jobs:
5962
show-code-coverage: false
6063
upload-bundles: false
6164
show-passed-tests: false
62-
if: (success() || failure()) && inputs.action == 'test'
65+
if: (success() || failure()) && inputs.action == 'test' && ${{ inputs.ios != '^26' }}
6366
- uses: codecov/codecov-action@v4
6467
with:
6568
flags: ${{ inputs.lib }}

0 commit comments

Comments
 (0)