Skip to content

Commit 8176e51

Browse files
committed
Move changes to int tests
1 parent 5f69489 commit 8176e51

File tree

2 files changed

+4
-42
lines changed

2 files changed

+4
-42
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,12 @@ jobs:
5656
- name: Configure Xcode
5757
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
5858
- name: Install visionOS sim if needed
59-
if: ${{ contains(matrix.destination, 'platform=visionOS Simulator') }}
59+
if: ${{ contains(matrix.runner, 'macos-14') && contains(matrix.destination, 'platform=visionOS Simulator') }}
6060
run: |
6161
sudo xcodebuild -runFirstLaunch
6262
xcrun simctl list > /dev/null
6363
sudo xcodebuild -downloadPlatform visionOS
6464
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
7965
- name: Checkout aws-sdk-swift
8066
uses: actions/checkout@v4
8167
with:
@@ -85,16 +71,6 @@ jobs:
8571
with:
8672
AUTOMATION_USER_SSH_PRIVATE_KEY: ${{ secrets.AUTOMATION_USER_SSH_PRIVATE_KEY }}
8773
STAGING_PARTNER_REPO: ${{ secrets.STAGING_PARTNER_REPO }}
88-
# - name: Show destinations
89-
# run: |
90-
# cd aws-sdk-swift
91-
# xcrun simctl create "iPhone 17" "iPhone 17"
92-
# xcrun simctl list > /dev/null
93-
# set -o pipefail && \
94-
# NSUnbufferedIO=YES xcodebuild \
95-
# -scheme aws-sdk-swift-Package \
96-
# -showdestinations \
97-
# 2>&1
9874
- name: Cache Gradle
9975
uses: actions/cache@v4
10076
with:

.github/workflows/integration-test.yml

Lines changed: 3 additions & 17 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)'
@@ -61,26 +61,12 @@ jobs:
6161
- name: Configure Xcode
6262
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
6363
- name: Install visionOS sim if needed
64-
if: ${{ contains(matrix.destination, 'platform=visionOS Simulator') }}
64+
if: ${{ contains(matrix.runner, 'macos-14') && contains(matrix.destination, 'platform=visionOS Simulator') }}
6565
run: |
6666
sudo xcodebuild -runFirstLaunch
6767
xcrun simctl list > /dev/null
6868
sudo xcodebuild -downloadPlatform visionOS
6969
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
8470
- name: Configure AWS Credentials for Integration Tests
8571
uses: aws-actions/configure-aws-credentials@v4
8672
with:

0 commit comments

Comments
 (0)