From 1337ef4912ec1f4e88df15b42c642617de5b4099 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 20 Jul 2024 00:20:39 -0500
Subject: [PATCH] Test macOS ARM64

---
 .github/workflows/build.yml | 97 ++-----------------------------------
 1 file changed, 5 insertions(+), 92 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15dd9619..39caaf0f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,96 +2,9 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  linux-configure-gcc:
-    name: GCC (Linux)
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install Dependencies
-      run: |
-        sudo apt update
-        sudo apt install autoconf automake make gcc g++ qtbase5-dev qtbase5-dev-tools qttools5-dev-tools libgl1-mesa-dev
-    - name: autogen.sh
-      run: ./autogen.sh
-    - name: configure
-      run: CC=gcc CXX=g++ ./configure
-    - name: make
-      run: make
-    - name: make install
-      run: sudo make install
-
-  linux-configure-clang:
-    name: Clang (Linux)
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install Dependencies
-      run: |
-        sudo apt update
-        sudo apt install autoconf automake make gcc g++ qtbase5-dev qtbase5-dev-tools qttools5-dev-tools libgl1-mesa-dev
-    - name: autogen.sh
-      run: ./autogen.sh
-    - name: configure
-      run: CC=clang CXX=clang++ ./configure
-    - name: make
-      run: make
-    - name: make install
-      run: sudo make install
-
-  linux-make:
-    name: Makefile.generic (Linux, GCC)
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install Dependencies
-      run: |
-        sudo apt update
-        sudo apt install autoconf automake make gcc g++ qtbase5-dev qtbase5-dev-tools qttools5-dev-tools libgl1-mesa-dev
-    - name: Setup
-      run: cp config.h.generic config.h
-    - name: make
-      run: make -f Makefile.generic
-    - name: make install
-      run: sudo make -f Makefile.generic install
-
-  linux-flatpak:
-    name: Flatpak (Linux, GCC)
-    # flatpak-builder fails to download glu on ubuntu-22.04
-    # (glu specified in mm3d-flatpak.yml)
-    # see https://github.com/flatpak/flatpak-builder/issues/468
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0 # This is needed for "git describe" to work.
-    - name: Install Dependencies
-      run: |
-        sudo apt update
-        sudo apt install flatpak flatpak-builder
-        flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    - name: Set version for the Flatpak
-      run: |
-        # if not a tag, add version
-        if [ $(git describe) != $(git describe --abbrev=0) ]; then
-          sed -i "s|<releases>|<releases>\n    <release version=\"$(git describe|sed 's/^v\([0-9]\)/\1/')\" date=\"$(git show -s --pretty=format:%ad --date=short)\" />|" desktop/moe.clover.mm3d.metainfo.xml
-        fi
-        cat desktop/moe.clover.mm3d.metainfo.xml
-    - name: flatpak-builder
-      run: flatpak-builder --user --install-deps-from=flathub --repo=flatpak-repo --state-dir=flatpak-state flatpak-build mm3d-flatpak.yaml
-    - name: flatpak build-bundle
-      run: flatpak build-bundle flatpak-repo moe.clover.mm3d-$(git describe|sed 's/^v\([0-9]\)/\1/').flatpak moe.clover.mm3d
-    - name: flatpak install
-      run: |
-        flatpak install --user -y moe.clover.mm3d-$(git describe|sed 's/^v\([0-9]\)/\1/').flatpak
-        flatpak list
-    - uses: actions/upload-artifact@v4
-      with:
-        name: Flatpak Bundle
-        path: ./*.flatpak
-
   macOS:
-    name: macOS (x86_64)
-    runs-on: macOS-13
+    name: macOS (ARM64)
+    runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v4
       with:
@@ -101,15 +14,15 @@ jobs:
         brew install autoconf automake qt@5
     - name: Configure
       run: |
-        qt_version=$(ls -1 /usr/local/Cellar/qt@5 | sort -rV | head -1)
+        qt_version=$(ls -1 /opt/homebrew/opt/qt@5 | sort -rV | head -1)
         # Get version from line "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13"
-        macosx_version_min=$(grep QMAKE_MACOSX_DEPLOYMENT_TARGET /usr/local/Cellar/qt@5/${qt_version}/mkspecs/common/macx.conf | cut -d' ' -f3)
+        macosx_version_min=$(grep QMAKE_MACOSX_DEPLOYMENT_TARGET /opt/homebrew/opt/qt@5/${qt_version}/mkspecs/common/macx.conf | cut -d' ' -f3)
         echo "Qt version: ${qt_version}, minimum macOS version: ${macosx_version_min}"
         if [ -z "${qt_version}" -o -z "${macosx_version_min}" ]; then
           exit 1
         fi
         ./autogen.sh
-        ./configure --with-Qt-dir=/usr/local/Cellar/qt@5/${qt_version} --with-macosx-version-min=${macosx_version_min}
+        ./configure --with-Qt-dir=/opt/homebrew/opt/qt@5/${qt_version} --with-macosx-version-min=${macosx_version_min}
     - name: make
       run: make
     - name: make appbundle