Skip to content

Commit 09051a0

Browse files
committed
remove runtime check
1 parent 8814d52 commit 09051a0

File tree

10 files changed

+49
-132
lines changed

10 files changed

+49
-132
lines changed

.github/composite_actions/ensure_platform_runtime/action.yml

Lines changed: 0 additions & 73 deletions
This file was deleted.

.github/composite_actions/get_platform_parameters/action.yml

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,34 +78,66 @@ runs:
7878
INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
7979
8080
case $INPUT_PLATFORM/$INPUT_XCODE_VERSION in
81-
iOS/latest|iOS/beta)
81+
iOS/latest)
8282
DEVICE="iPhone 16"
8383
OS_VERSION="18.2"
8484
;;
85+
iOS/beta)
86+
DEVICE="iPhone 16"
87+
OS_VERSION="26.0"
88+
;;
89+
iOS/minimum)
90+
DEVICE="iPhone 15"
91+
OS_VERSION="18.0"
92+
;;
8593
iOS/*)
8694
DEVICE="iPhone 15"
8795
OS_VERSION="17.0.1"
8896
;;
89-
tvOS/latest|tvOS/beta)
97+
tvOS/latest)
9098
DEVICE="Apple TV 4K (3rd generation)"
9199
OS_VERSION="18.2"
92100
;;
101+
tvOS/beta)
102+
DEVICE="Apple TV 4K (3rd generation)"
103+
OS_VERSION="26.0"
104+
;;
105+
tvOS/minimum)
106+
DEVICE="Apple TV 4K (3rd generation)"
107+
OS_VERSION="18.0"
108+
;;
93109
tvOS/*)
94110
DEVICE="Apple TV 4K (3rd generation)"
95111
OS_VERSION="17.0"
96112
;;
97-
watchOS/latest|watchOS/beta)
113+
watchOS/latest)
98114
DEVICE="Apple Watch Series 10 (46mm)"
99115
OS_VERSION="11.2"
100116
;;
117+
watchOS/beta)
118+
DEVICE="Apple Watch Series 10 (46mm)"
119+
OS_VERSION="26.0"
120+
;;
121+
watchOS/minimum)
122+
DEVICE="Apple Watch Series 7 (45mm)"
123+
OS_VERSION="11.0"
124+
;;
101125
watchOS/*)
102126
DEVICE="Apple Watch Series 7 (45mm)"
103127
OS_VERSION="10.0"
104128
;;
105-
visionOS/latest|visionOS/beta)
129+
visionOS/latest)
106130
DEVICE="Apple Vision Pro"
107131
OS_VERSION="2.2"
108132
;;
133+
visionOS/beta)
134+
DEVICE="Apple Vision Pro"
135+
OS_VERSION="26.0"
136+
;;
137+
visionOS/minimum)
138+
DEVICE="Apple Vision Pro"
139+
OS_VERSION="2.0"
140+
;;
109141
visionOS/*)
110142
DEVICE="Apple Vision Pro"
111143
OS_VERSION="1.0"

.github/workflows/build_minimum_supported_swift_platforms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: ./.github/workflows/build_scheme.yml
2828
with:
2929
scheme: Amplify-Build
30-
os-runner: 'macos-14'
30+
os-runner: 'macos-15'
3131
xcode-version: 'minimum'
3232
platform: ${{ matrix.platform }}
3333
save_build_cache: false

.github/workflows/build_scheme.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ jobs:
4343
platform: ${{ inputs.platform }}
4444
xcode_version: ${{ inputs.xcode-version }}
4545

46-
- name: Ensure simulator runtime and resolve destination
47-
id: destination
48-
uses: ./.github/composite_actions/ensure_platform_runtime
49-
with:
50-
platform: ${{ inputs.platform }}
51-
preferred_destination: ${{ steps.platform.outputs.destination }}
52-
5346
- name: Attempt to use the dependencies cache
5447
id: dependencies-cache
5548
timeout-minutes: 4
@@ -76,7 +69,7 @@ jobs:
7669
uses: ./.github/composite_actions/run_xcodebuild
7770
with:
7871
scheme: ${{ inputs.scheme }}
79-
destination: ${{ steps.destination.outputs.resolved_destination }}
72+
destination: ${{ steps.platform.outputs.destination }}
8073
sdk: ${{ steps.platform.outputs.sdk }}
8174
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
8275
cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify

.github/workflows/canary.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
xcode-version: '16.4.0'
2020
device: 'iPhone 16'
2121
version: '18.2'
22-
- os: macos-14
22+
- os: macos-15
2323
xcode-version: '16.0.0'
2424
device: 'iPhone 15'
25-
version: '17.0.1'
25+
version: '18.0'
2626
name: Canary Test - Xcode ${{ matrix.xcode-version }}
2727
runs-on: ${{ matrix.os }}
2828
steps:

.github/workflows/integ_test_auth_webauthn.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ jobs:
2626
with:
2727
platform: iOS
2828

29-
- name: Ensure simulator runtime and resolve destination
30-
id: destination
31-
uses: ./.github/composite_actions/ensure_platform_runtime
32-
with:
33-
platform: iOS
34-
preferred_destination: ${{ steps.platform.outputs.destination }}
35-
3629
- name: Create the test configuration directory
3730
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
3831

@@ -84,7 +77,7 @@ jobs:
8477
uses: ./.github/composite_actions/run_xcodebuild_test
8578
with:
8679
scheme: AuthWebAuthnApp
87-
destination: ${{ steps.destination.outputs.resolved_destination }}
80+
destination: ${{ steps.platform.outputs.destination }}
8881
sdk: ${{ steps.platform.outputs.sdk }}
8982
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
9083
project_path: ./AmplifyPlugins/Auth/Tests/AuthWebAuthnApp
@@ -99,7 +92,7 @@ jobs:
9992
uses: ./.github/composite_actions/run_xcodebuild_test
10093
with:
10194
scheme: AuthWebAuthnApp
102-
destination: ${{ steps.destination.outputs.resolved_destination }}
95+
destination: ${{ steps.platform.outputs.destination }}
10396
sdk: ${{ steps.platform.outputs.sdk }}
10497
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
10598
project_path: ./AmplifyPlugins/Auth/Tests/AuthWebAuthnApp

.github/workflows/integ_test_push_notifications.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ jobs:
4949
with:
5050
platform: ${{ matrix.platform }}
5151

52-
- name: Ensure simulator runtime and resolve destination
53-
id: destination
54-
uses: ./.github/composite_actions/ensure_platform_runtime
55-
with:
56-
platform: ${{ matrix.platform }}
57-
preferred_destination: ${{ steps.platform.outputs.destination }}
58-
5952
- name: Create the test configuration directory
6053
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
6154

@@ -107,7 +100,7 @@ jobs:
107100
uses: ./.github/composite_actions/run_xcodebuild_test
108101
with:
109102
scheme: ${{ matrix.platform == 'watchOS' && 'PushNotificationWatchTests' || 'PushNotificationHostApp' }}
110-
destination: ${{ steps.destination.outputs.resolved_destination }}
103+
destination: ${{ steps.platform.outputs.destination }}
111104
sdk: ${{ steps.platform.outputs.sdk }}
112105
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
113106
project_path: ./AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp
@@ -122,7 +115,7 @@ jobs:
122115
uses: ./.github/composite_actions/run_xcodebuild_test
123116
with:
124117
scheme: ${{ matrix.platform == 'watchOS' && 'PushNotificationWatchTests' || 'PushNotificationHostApp' }}
125-
destination: ${{ steps.destination.outputs.resolved_destination }}
118+
destination: ${{ steps.platform.outputs.destination }}
126119
sdk: ${{ steps.platform.outputs.sdk }}
127120
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
128121
project_path: ./AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp

.github/workflows/run_integration_tests.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ jobs:
5757
xcode_version: ${{ inputs.xcode_version }}
5858
destination: ${{ inputs.destination }}
5959

60-
- name: Ensure simulator runtime and resolve destination
61-
id: destination
62-
uses: ./.github/composite_actions/ensure_platform_runtime
63-
with:
64-
platform: ${{ inputs.platform }}
65-
preferred_destination: ${{ steps.platform.outputs.destination }}
66-
6760
- name: Create the test configuration directory
6861
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
6962

@@ -103,7 +96,7 @@ jobs:
10396
uses: ./.github/composite_actions/run_xcodebuild_test
10497
with:
10598
scheme: ${{ inputs.scheme }}
106-
destination: ${{ steps.destination.outputs.resolved_destination }}
99+
destination: ${{ steps.platform.outputs.destination }}
107100
sdk: ${{ steps.platform.outputs.sdk }}
108101
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
109102
project_path: ${{ inputs.project_path }}
@@ -120,7 +113,7 @@ jobs:
120113
uses: ./.github/composite_actions/run_xcodebuild_test
121114
with:
122115
scheme: ${{ inputs.scheme }}
123-
destination: ${{ steps.destination.outputs.resolved_destination }}
116+
destination: ${{ steps.platform.outputs.destination }}
124117
sdk: ${{ steps.platform.outputs.sdk }}
125118
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
126119
project_path: ${{ inputs.project_path }}

.github/workflows/run_unit_tests.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ jobs:
5757
platform: ${{ inputs.platform }}
5858
xcode_version: ${{ inputs.xcode_version }}
5959

60-
- name: Ensure simulator runtime and resolve destination
61-
id: destination
62-
uses: ./.github/composite_actions/ensure_platform_runtime
63-
with:
64-
platform: ${{ inputs.platform }}
65-
preferred_destination: ${{ steps.platform.outputs.destination }}
66-
6760
- name: Attempt to use the dependencies cache
6861
id: dependencies-cache
6962
timeout-minutes: 4
@@ -91,7 +84,7 @@ jobs:
9184
uses: ./.github/composite_actions/run_xcodebuild_test
9285
with:
9386
scheme: ${{ inputs.scheme }}
94-
destination: ${{ steps.destination.outputs.resolved_destination }}
87+
destination: ${{ steps.platform.outputs.destination }}
9588
sdk: ${{ steps.platform.outputs.sdk }}
9689
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
9790
generate_coverage: ${{ inputs.generate_coverage_report }}
@@ -106,7 +99,7 @@ jobs:
10699
uses: ./.github/composite_actions/run_xcodebuild_test
107100
with:
108101
scheme: ${{ inputs.scheme }}
109-
destination: ${{ steps.destination.outputs.resolved_destination }}
102+
destination: ${{ steps.platform.outputs.destination }}
110103
sdk: ${{ steps.platform.outputs.sdk }}
111104
xcode_path: /Applications/Xcode_${{ steps.platform.outputs.xcode-version }}.app
112105
project_path: ${{ inputs.project_path }}

.github/workflows/stress_test.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: macos-15
1818
environment: IntegrationTest
1919
outputs:
20-
destination: ${{ steps.destination.outputs.resolved_destination }}
20+
destination: ${{ steps.platform.outputs.destination }}
2121
xcode-version: ${{ steps.platform.outputs.xcode-version }}
2222
steps:
2323
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
@@ -38,13 +38,6 @@ jobs:
3838
with:
3939
platform: 'iOS'
4040

41-
- name: Ensure simulator runtime and resolve destination
42-
id: destination
43-
uses: ./.github/composite_actions/ensure_platform_runtime
44-
with:
45-
platform: 'iOS'
46-
preferred_destination: ${{ steps.platform.outputs.destination }}
47-
4841
auth-stress-test:
4942
needs: prepare-for-test
5043
runs-on: macos-15

0 commit comments

Comments
 (0)