Merge branch 'main' into feat/sts-web-identity-cred-provider

awslabs · Feb 9, 2024 · b76c732 · b76c732
2 parents df32519 + 4c27a31
commit b76c732
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 29 deletions.
diff --git a/.github/workflows/codegen-build-test.yml b/.github/workflows/codegen-build-test.yml
@@ -11,10 +11,10 @@ env:
 
 jobs:
   codegen-build-test:
-    runs-on: macos-13
+    runs-on: macos-14-xlarge
     environment: Codegen-Build-Test
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
       - name: Checkout aws-sdk-swift
         uses: actions/checkout@v3

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -17,52 +17,52 @@ 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 }}
           path: smithy-swift
       - 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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
   swiftlint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/realm/swiftlint:0.53.0
+      image: ghcr.io/realm/swiftlint:0.54.0
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx4096M
 
 # codegen
-smithyVersion=1.42.0
+smithyVersion=1.44.0
 smithyGradleVersion=0.6.0
 
 smithySwiftVersion = 0.1.0

diff --git a/scripts/ci_steps/log_tool_versions.sh b/scripts/ci_steps/log_tool_versions.sh
@@ -2,40 +2,52 @@
 
 set -e
 
+echo
+
+# Log CPU for hardware in use, if running on Mac
+
+if [[ "$OSTYPE" == "darwin"* ]];
+then
+  which sysctl
+  sysctl -a | grep machdep.cpu || true
+else
+  echo "sysctl not run (not a Mac)"
+fi
+echo
+
 # Log location & version for swiftc, xcodebuild, java, xcbeautify
 
 if command -v swiftc &> /dev/null
 then
   which swiftc
   swiftc --version
-  echo
 else
   echo "swiftc not installed"
 fi
+echo
 
 if command -v xcodebuild &> /dev/null
 then
   which xcodebuild
   xcodebuild -version
-  echo
 else
   echo "xcodebuild not installed"
 fi
+echo
 
 if command -v java &> /dev/null
 then
   which java
   java --version
-  echo
 else
   echo "java not installed"
 fi
+echo
 
 if command -v xcbeautify &> /dev/null
 then
   which xcbeautify
   xcbeautify --version
-  echo
 else
   echo "xcbeautify not installed"
 fi