From 397110e35ebe47fac08ce4b7707088f7fb870496 Mon Sep 17 00:00:00 2001
From: Jose Quintana <joseluisquintana20@gmail.com>
Date: Tue, 14 Dec 2021 08:40:13 +0100
Subject: [PATCH] refactor: drop macos-10.15 beta xcode+sdk for aarch64-apple-darwin

since Xcode 13.0 uses SDK 11.3 by default on macos-11 (latest)
---
 .github/workflows/devel.yml   | 11 ++---------
 .github/workflows/release.yml | 14 ++------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml
index a482a80..355fa7c 100644
--- a/.github/workflows/devel.yml
+++ b/.github/workflows/devel.yml
@@ -84,11 +84,11 @@ jobs:
             rust: nightly
             target: arm-unknown-linux-gnueabihf
           - build: macos
-            os: macos-latest
+            os: macos-11
             rust: nightly
             target: x86_64-apple-darwin
           - build: macos-arm64
-            os: macos-latest
+            os: macos-11
             rust: nightly
             target: aarch64-apple-darwin
           - build: windows-msvc
@@ -141,13 +141,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
-
     - name: Run tests
       if: env.SKIP_TESTS == ''
       run: ${{ env.CARGO }} test --verbose ${{ env.TARGET_FLAGS }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dd1aa9a..6875834 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -92,11 +92,11 @@ jobs:
           rust: nightly
           target: arm-unknown-linux-gnueabihf
         - build: macos
-          os: macos-latest
+          os: macos-11
           rust: nightly
           target: x86_64-apple-darwin
         - build: macos-arm64
-          os: macos-latest
+          os: macos-11
           rust: nightly
           target: aarch64-apple-darwin
         - build: windows-msvc
@@ -144,16 +144,6 @@ jobs:
         echo "target flag is: ${{ env.TARGET_FLAGS }}"
         echo "target dir is: ${{ env.TARGET_DIR }}"
 
-    - name: aarch64 specific items
-      if: matrix.build == 'macos-arm64'
-      run: |
-        # 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
-
     - name: Build release binary
       run: ${{ env.CARGO }} build --verbose --release ${{ env.TARGET_FLAGS }}
 
--
libgit2 1.7.2