From c6305ca37961587414a416386d96778dcf3e8ac3 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 21 Aug 2025 12:02:22 -0400 Subject: [PATCH 1/2] chore(ci): Build/test macOS for arm64 rather than x86_64 --- scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 2be500a8bbc..35ebd62b958 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -180,7 +180,7 @@ ipad_flags=( macos_flags=( -sdk 'macosx' - -destination 'platform=OS X,arch=x86_64' + -destination 'platform=OS X,arch=arm64' ) tvos_flags=( -sdk "appletvsimulator" @@ -195,7 +195,7 @@ visionos_flags=( ) catalyst_flags=( ARCHS=x86_64 VALID_ARCHS=x86_64 SUPPORTS_MACCATALYST=YES -sdk macosx - -destination platform="macOS,variant=Mac Catalyst,arch=x86_64" TARGETED_DEVICE_FAMILY=2 + -destination platform="macOS,variant=Mac Catalyst,arch=arm64" TARGETED_DEVICE_FAMILY=2 CODE_SIGN_IDENTITY=- CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO ) From 4d7551eb42209304a824109d74ce01a3582787df Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Thu, 21 Aug 2025 17:49:57 -0400 Subject: [PATCH 2/2] Update spm.yml --- .github/workflows/spm.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml index 6d583ebd780..71bd7247307 100644 --- a/.github/workflows/spm.yml +++ b/.github/workflows/spm.yml @@ -149,3 +149,9 @@ jobs: run: scripts/third_party/travis/retry.sh ./scripts/build.sh version-test ${{ matrix.target }} spm - name: Analytics Build Tests run: scripts/third_party/travis/retry.sh ./scripts/build.sh analytics-import-test ${{ matrix.target }} spm + - name: Upload xcodebuild logs + if: failure() + uses: actions/upload-artifact@v4 + with: + name: xcodebuild-logs-${{ matrix.target }} + path: xcodebuild-*.log