Feature: Create Universal (x86_64 + Apple Silicon) build on macOS

OpenTTD · Nov 12, 2020 · a7d2390 · a7d2390
1 parent 8e4a3a0
commit a7d2390
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -107,17 +107,22 @@ jobs:
   macos:
     name: Mac OS
 
-    runs-on: macos-latest
+    runs-on: macos-11.0
     strategy:
       fail-fast: false
     env:
       CTEST_OUTPUT_ON_FAILURE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
+      DEVELOPER_DIR: /Applications/Xcode_12.2.app/Contents/Developer
+      ONLY_ACTIVE_ARCH: NO
 
     steps:
     - name: Checkout
       uses: actions/checkout@v2
 
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select -s /Applications/Xcode_12.2.app
+
     - name: Install dependencies
       run: brew install pkg-config lzo xz libpng freetype
       env:
@@ -132,7 +137,7 @@ jobs:
         rm -f opengfx-all.zip
 
     - name: CMake
-      run: mkdir build && cd build && cmake ..
+      run: mkdir build && cd build && cmake .. -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64
 
     - uses: ammaraskar/gcc-problem-matcher@master
     - name: Build