Skip to content

Commit f370a26

Browse files
authored
chore: Run "latest" Mac builds on macOS 26 (#2019)
1 parent a5bca17 commit f370a26

File tree

2 files changed

+4
-46
lines changed

2 files changed

+4
-46
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes
2020
runner:
2121
- macos-14
22-
- macos-15
22+
- macos-26
2323
xcode:
2424
- Xcode_15.2
2525
- Xcode_26.0
@@ -36,7 +36,7 @@ jobs:
3636
- runner: macos-14
3737
xcode: Xcode_26.0
3838
# Don't run new macOS with old Xcode
39-
- runner: macos-15
39+
- runner: macos-26
4040
xcode: Xcode_15.2
4141
# Don't run old simulators with new Xcode
4242
- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
@@ -55,27 +55,6 @@ jobs:
5555
steps:
5656
- name: Configure Xcode
5757
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
58-
- name: Install visionOS sim if needed
59-
if: ${{ contains(matrix.destination, 'platform=visionOS Simulator') }}
60-
run: |
61-
sudo xcodebuild -runFirstLaunch
62-
xcrun simctl list > /dev/null
63-
sudo xcodebuild -downloadPlatform visionOS
64-
sudo xcodebuild -runFirstLaunch
65-
- name: Install iOS 26 sim if needed
66-
if: ${{ contains(matrix.xcode, '26') && contains(matrix.destination, 'platform=iOS Simulator') }}
67-
run: |
68-
sudo xcodebuild -runFirstLaunch
69-
xcrun simctl list > /dev/null
70-
sudo xcodebuild -downloadPlatform iOS
71-
sudo xcodebuild -runFirstLaunch
72-
- name: Install tvOS 26 sim if needed
73-
if: ${{ contains(matrix.xcode, '26') && contains(matrix.destination, 'platform=tvOS Simulator') }}
74-
run: |
75-
sudo xcodebuild -runFirstLaunch
76-
xcrun simctl list > /dev/null
77-
sudo xcodebuild -downloadPlatform tvOS
78-
sudo xcodebuild -runFirstLaunch
7958
- name: Checkout aws-sdk-swift
8059
uses: actions/checkout@v4
8160
with:

.github/workflows/integration-test.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes
2525
runner:
2626
- macos-14
27-
- macos-15
27+
- macos-26
2828
xcode:
2929
- Xcode_15.2
3030
- Xcode_26.0
@@ -41,7 +41,7 @@ jobs:
4141
- runner: macos-14
4242
xcode: Xcode_26.0
4343
# Don't run new macOS with old Xcode
44-
- runner: macos-15
44+
- runner: macos-26
4545
xcode: Xcode_15.2
4646
# Don't run old simulators with new Xcode
4747
- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
@@ -60,27 +60,6 @@ jobs:
6060
steps:
6161
- name: Configure Xcode
6262
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
63-
- name: Install visionOS sim if needed
64-
if: ${{ contains(matrix.destination, 'platform=visionOS Simulator') }}
65-
run: |
66-
sudo xcodebuild -runFirstLaunch
67-
xcrun simctl list > /dev/null
68-
sudo xcodebuild -downloadPlatform visionOS
69-
sudo xcodebuild -runFirstLaunch
70-
- name: Install iOS 26 sim if needed
71-
if: ${{ contains(matrix.xcode, '26') && contains(matrix.destination, 'platform=iOS Simulator') }}
72-
run: |
73-
sudo xcodebuild -runFirstLaunch
74-
xcrun simctl list > /dev/null
75-
sudo xcodebuild -downloadPlatform iOS
76-
sudo xcodebuild -runFirstLaunch
77-
- name: Install tvOS 26 sim if needed
78-
if: ${{ contains(matrix.xcode, '26') && contains(matrix.destination, 'platform=tvOS Simulator') }}
79-
run: |
80-
sudo xcodebuild -runFirstLaunch
81-
xcrun simctl list > /dev/null
82-
sudo xcodebuild -downloadPlatform tvOS
83-
sudo xcodebuild -runFirstLaunch
8463
- name: Configure AWS Credentials for Integration Tests
8564
uses: aws-actions/configure-aws-credentials@v4
8665
with:

0 commit comments

Comments
 (0)