From 7e55850cb7bebbfc38243da0a218488478db7438 Mon Sep 17 00:00:00 2001 From: Wyatt Carss Date: Thu, 21 Oct 2021 13:15:38 -0400 Subject: [PATCH] Drop aarch64-apple-darwin build xcode+sdk lines. Xcode 12.2 is likely out of date, and it is breaking PR builds since the latest mac image bumped to 13.0. Xcode 13.0 uses SDK 11.3 by default, so we shouldn't need to specify the SDK any longer either, and not specifying the precise versions ought to be less fragile. --- .github/workflows/macos-builds-on-all.yaml | 7 ------- ci/actions-templates/macos-builds-template.yaml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/.github/workflows/macos-builds-on-all.yaml b/.github/workflows/macos-builds-on-all.yaml index f3cb6052cc..e2e317bf02 100644 --- a/.github/workflows/macos-builds-on-all.yaml +++ b/.github/workflows/macos-builds-on-all.yaml @@ -78,13 +78,6 @@ jobs: # Can't run tests: cross-compiling echo "SKIP_TESTS=yes" >> $GITHUB_ENV - - # Use the beta compiler - sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/ - - # Set SDK environment variables - echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV - echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV if: matrix.target == 'aarch64-apple-darwin' - name: Ensure we have our goal target installed run: | diff --git a/ci/actions-templates/macos-builds-template.yaml b/ci/actions-templates/macos-builds-template.yaml index f3cb6052cc..e2e317bf02 100644 --- a/ci/actions-templates/macos-builds-template.yaml +++ b/ci/actions-templates/macos-builds-template.yaml @@ -78,13 +78,6 @@ jobs: # Can't run tests: cross-compiling echo "SKIP_TESTS=yes" >> $GITHUB_ENV - - # Use the beta compiler - sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/ - - # Set SDK environment variables - echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV - echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV if: matrix.target == 'aarch64-apple-darwin' - name: Ensure we have our goal target installed run: |