Skip to content

Commit

Permalink
chore: On CI, use Xcode 15.4 as latest instead of 15.3 (#1509)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbelkins authored May 17, 2024
1 parent 603167f commit a918bcf
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codegen-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
codegen-build-test:
runs-on: macos-14-xlarge
env:
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
steps:
- name: Checkout aws-sdk-swift
uses: actions/checkout@v3
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,31 @@ jobs:
- macos-14-xlarge
xcode:
- Xcode_14.1
- Xcode_15.3
- Xcode_15.4
destination:
- 'platform=iOS Simulator,OS=16.1,name=iPhone 14'
- 'platform=iOS Simulator,OS=17.4,name=iPhone 15'
- 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
- 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
- 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro'
- 'platform=OS X'
exclude:
# Don't run old macOS with new Xcode
- runner: macos-13-xlarge
xcode: Xcode_15.3
xcode: Xcode_15.4
# Don't run new macOS with old Xcode
- runner: macos-14-xlarge
xcode: Xcode_14.1
# Don't run old simulators with new Xcode
- destination: 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_15.3
xcode: Xcode_15.4
- destination: 'platform=iOS Simulator,OS=16.1,name=iPhone 14'
xcode: Xcode_15.3
xcode: Xcode_15.4
# Don't run new simulators with old Xcode
- destination: 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)'
- destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_14.1
- destination: 'platform=iOS Simulator,OS=17.4,name=iPhone 15'
- destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
xcode: Xcode_14.1
- destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
xcode: Xcode_14.1
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
-scheme aws-sdk-swift \
-destination '${{ matrix.destination }}' \
test 2>&1 \
| xcpretty
| xcbeautify
linux:
runs-on: ubuntu-latest
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ jobs:
- macos-14-xlarge
xcode:
- Xcode_14.1
- Xcode_15.3
- Xcode_15.4
destination:
- 'platform=iOS Simulator,OS=16.1,name=iPhone 14'
- 'platform=iOS Simulator,OS=17.4,name=iPhone 15'
- 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
- 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
- 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
- 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro'
- 'platform=OS X'
exclude:
# Don't run old macOS with new Xcode
- runner: macos-13-xlarge
xcode: Xcode_15.3
xcode: Xcode_15.4
# Don't run new macOS with old Xcode
- runner: macos-14-xlarge
xcode: Xcode_14.1
# Don't run old simulators with new Xcode
- destination: 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_15.3
xcode: Xcode_15.4
- destination: 'platform=iOS Simulator,OS=16.1,name=iPhone 14'
xcode: Xcode_15.3
xcode: Xcode_15.4
# Don't run new simulators with old Xcode
- destination: 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)'
- destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)'
xcode: Xcode_14.1
- destination: 'platform=iOS Simulator,OS=17.4,name=iPhone 15'
- destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15'
xcode: Xcode_14.1
- destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
xcode: Xcode_14.1
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
-testPlan AWSIntegrationTestsOnCI \
-destination '${{ matrix.destination }}' \
test 2>&1 \
| xcpretty
| xcbeautify
linux:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-configuration-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
codegen-build-with-release-configuration:
runs-on: macos-14-xlarge
env:
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
steps:
- name: Checkout aws-sdk-swift
uses: actions/checkout@v3
Expand Down

0 comments on commit a918bcf

Please sign in to comment.