Skip to content

Commit 5214bdd

Browse files
authored
chore: Specify Xcode_16 application name same as on Github runner (#831)
1 parent ea842e8 commit 5214bdd

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ env:
1212
jobs:
1313
apple-ci:
1414
runs-on: ${{ matrix.runner }}
15-
env:
16-
DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
1715
strategy:
1816
fail-fast: false
1917
matrix:
@@ -23,7 +21,7 @@ jobs:
2321
- macos-14
2422
xcode:
2523
- Xcode_15.2
26-
- Xcode_16.0
24+
- Xcode_16
2725
destination:
2826
- 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
2927
- 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
@@ -33,21 +31,25 @@ jobs:
3331
exclude:
3432
# Don't run old macOS with new Xcode
3533
- runner: macos-13
36-
xcode: Xcode_16.0
34+
xcode: Xcode_16
3735
# Don't run new macOS with old Xcode
3836
- runner: macos-14
3937
xcode: Xcode_15.2
4038
# Don't run old iOS/tvOS simulator with new Xcode
4139
- destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
42-
xcode: Xcode_16.0
40+
xcode: Xcode_16
4341
- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
44-
xcode: Xcode_16.0
42+
xcode: Xcode_16
4543
# Don't run new iOS/tvOS simulator with old Xcode
4644
- destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
4745
xcode: Xcode_15.2
4846
- destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
4947
xcode: Xcode_15.2
5048
steps:
49+
- name: Configure Xcode
50+
run: |
51+
sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
52+
xcode-select -p
5153
- name: Checkout smithy-swift
5254
uses: actions/checkout@v4
5355
- name: Cache Gradle
@@ -89,8 +91,6 @@ jobs:
8991
9092
apple-downstream:
9193
runs-on: ${{ matrix.runner }}
92-
env:
93-
DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
9494
strategy:
9595
fail-fast: false
9696
matrix:
@@ -100,7 +100,7 @@ jobs:
100100
- macos-14
101101
xcode:
102102
- Xcode_15.2
103-
- Xcode_16.0
103+
- Xcode_16
104104
destination:
105105
- 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
106106
- 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
@@ -110,21 +110,25 @@ jobs:
110110
exclude:
111111
# Don't run old macOS with new Xcode
112112
- runner: macos-13
113-
xcode: Xcode_16.0
113+
xcode: Xcode_16
114114
# Don't run new macOS with old Xcode
115115
- runner: macos-14
116116
xcode: Xcode_15.2
117117
# Don't run old iOS/tvOS simulator with new Xcode
118118
- destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
119-
xcode: Xcode_16.0
119+
xcode: Xcode_16
120120
- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
121-
xcode: Xcode_16.0
121+
xcode: Xcode_16
122122
# Don't run new iOS/tvOS simulator with old Xcode
123123
- destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15'
124124
xcode: Xcode_15.2
125125
- destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
126126
xcode: Xcode_15.2
127127
steps:
128+
- name: Configure Xcode
129+
run: |
130+
sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
131+
xcode-select -p
128132
- name: Checkout smithy-swift
129133
uses: actions/checkout@v4
130134
- name: Select aws-sdk-swift branch

0 commit comments

Comments
 (0)