ReReRevert MacOS Arm build (#63848)

CleverRaven · Mar 1, 2023 · d6ec466 · d6ec466
1 parent f1f721e
commit d6ec466
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 57 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -174,7 +174,6 @@ jobs:
             content: application/gzip
           - name: OSX Curses x64
             os: macos-10.15
-            arch: x64
             mxe: none
             tiles: 0
             sound: 0
@@ -183,22 +182,12 @@ jobs:
             content: application/x-apple-diskimage
           - name: OSX Tiles x64
             os: macos-10.15
-            arch: x64
             mxe: none
             tiles: 1
             sound: 0
             artifact: osx-tiles-x64
             ext: dmg
             content: application/x-apple-diskimage
-          - name: OSX Tiles arm64
-            os: macos-11
-            arch: arm64
-            mxe: none
-            tiles: 1
-            sound: 0
-            artifact: osx-tiles-arm64
-            ext: dmg
-            content: application/x-apple-diskimage
           - name: Android x64
             os: ubuntu-latest
             mxe: none
@@ -273,12 +262,8 @@ jobs:
       - name: Install dependencies (mac)
         if: runner.os == 'macOS'
         run: |
-          brew install gettext ccache parallel
-          ${{ github.workspace }}/build-scripts/get-mac-sdl2-framework.sh
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
           pip3 install mac_alias==2.2.0 dmgbuild==1.4.2 biplist
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
-          HOMEBREW_NO_INSTALL_CLEANUP: 1
       - name: Create VERSION.TXT
         shell: bash
         run: |
@@ -316,12 +301,7 @@ jobs:
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
         run: |
-          if [[ '${{ matrix.arch }}' == 'arm64' ]]; then
-            OSX_MIN=11.0
-          else
-            OSX_MIN=10.12
-          fi
-          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=$OSX_MIN FRAMEWORK=1 ARCH=${{ matrix.arch }} dmgdist
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=10.12 dmgdist
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Set up JDK 8 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'

diff --git a/build-scripts/get-mac-sdl2-framework.sh b/build-scripts/get-mac-sdl2-framework.sh