From 2affcf9e4dda8cd904f9a171d0d2ab78bd3921bc Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Fri, 9 Feb 2024 15:13:00 -0600 Subject: [PATCH] chore: Update CI to run on Apple Silicon (#1338) --- .github/workflows/continuous-integration.yml | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 0db0f95b488..2bb7bd0a767 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -17,44 +17,44 @@ jobs: matrix: # This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes runner: - - macos-12 - - macos-13 + - macos-13-xlarge + - macos-14-xlarge xcode: - - Xcode_14.0.1 - - Xcode_15.1 + - Xcode_14.1 + - Xcode_15.2 destination: - - 'platform=iOS Simulator,OS=16.0,name=iPhone 14' + - 'platform=iOS Simulator,OS=16.1,name=iPhone 14' - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - - 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)' + - 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=OS X' exclude: # Don't run old macOS with new Xcode - - runner: macos-12 - xcode: Xcode_15.1 + - runner: macos-13-xlarge + xcode: Xcode_15.2 # Don't run new macOS with old Xcode - - runner: macos-13 - xcode: Xcode_14.0.1 + - runner: macos-14-xlarge + xcode: Xcode_14.1 # Don't run old simulators with new Xcode - - destination: 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)' - xcode: Xcode_15.1 - - destination: 'platform=iOS Simulator,OS=16.0,name=iPhone 14' - xcode: Xcode_15.1 + - destination: 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)' + xcode: Xcode_15.2 + - destination: 'platform=iOS Simulator,OS=16.1,name=iPhone 14' + xcode: Xcode_15.2 # Don't run new simulators with old Xcode - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - xcode: Xcode_14.0.1 + xcode: Xcode_14.1 - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - xcode: Xcode_14.0.1 + xcode: Xcode_14.1 steps: - name: Checkout aws-sdk-swift - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Select smithy-swift branch run: | ORIGINAL_REPO_HEAD_REF="$GITHUB_HEAD_REF" \ DEPENDENCY_REPO_URL="https://github.com/smithy-lang/smithy-swift.git" \ ./scripts/ci_steps/select_dependency_branch.sh - name: Checkout smithy-swift - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: smithy-lang/smithy-swift ref: ${{ env.DEPENDENCY_REPO_SHA }} @@ -62,7 +62,7 @@ jobs: - name: Move smithy-swift into place run: mv smithy-swift .. - name: Cache Gradle - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -72,7 +72,7 @@ jobs: 1-${{ runner.os }}-gradle-${{ hashFiles('settings.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties') }} 1-${{ runner.os }}-gradle- - name: Cache Swift - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/Library/Caches/org.swift.swiftpm @@ -82,7 +82,7 @@ jobs: 1-${{ runner.os }}-${{ matrix.xcode }}-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }} 1-${{ runner.os }}-${{ matrix.xcode }}- - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: corretto java-version: 17