chore: Use Apple Silicon for codegen-build-test on CI (#1336)

awslabs · Feb 8, 2024 · 63f87f6 · 63f87f6
1 parent 1cd4f41
commit 63f87f6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 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/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