[CI] Use MacOS universal build instead of arm64.

Also switch to (now available) macOS 11.

Author: Faless

.github/workflows/ci.yml

@@ -145,9 +145,9 @@ jobs:
         run: |
           ./Godot.app/Contents/MacOS/Godot --path test -s script.gd
 
-  macos-arm64:
+  macos-universal:
     name: Build (macOS, Clang, cross-compile arm64)
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -165,12 +165,7 @@ jobs:
 
       - name: Build godot-cpp
         run: |
-          # The default SDK in github the actions environemnt seems to have problems compiling for arm64.
-          # Use the latest 11.x SDK.
-          SDK_BASE=/Library/Developer/CommandLineTools/SDKs
-          SDK_VER=$(ls $SDK_BASE | grep "MacOSX11." | sort -r | head -n1)
-          echo $SDK_BASE/$SDK_VER/
-          scons target=release generate_bindings=yes macos_arch=arm64 macos_deployment_target=10.15 macos_sdk_path="$SDK_BASE/$SDK_VER/" -j $(sysctl -n hw.logicalcpu)
+          scons target=release generate_bindings=yes macos_arch=universal -j $(sysctl -n hw.logicalcpu)
 
   static-checks:
     name: Static Checks (clang-format)