ci(mac): Add mac m1 build

ktgw0316 · Feb 28, 2024 · 5c6566d · 5c6566d
1 parent 8d84df9
commit 5c6566d
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, macos-14]
         java: ['17']
     runs-on: ${{ matrix.os }}
     steps:
@@ -26,14 +26,12 @@ jobs:
       if: startsWith(matrix.os, 'windows')
       shell: bash
       run: |
-        export MINGW64_PATH=/mingw64
-        export MINGW32_PATH=/mingw32
-        export PATH=/msys64/usr/bin/:$PATH
+        export PATH=/msys64/usr/bin/:/msys32/usr/bin/:$PATH
         export MSSDK_HOME=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/Lib/10.0.22621.0
         
-        MINGW_DIR=$MINGW64_PATH ant -f windows/build.xml -lib lightcrafts/lib zip
+        ant -f windows/build.xml -lib lightcrafts/lib zip
         ant -f windows/build.xml clean-native
-        MSYSTEM=MINGW32 TARGET_ARCH=i686 MINGW_DIR=/$MINGW32_PATH ant -f windows/build.xml -Dno-ivy=true -lib lightcrafts/lib zip
+        MSYSTEM=MINGW32 TARGET_ARCH=i686 ant -f windows/build.xml -Dno-ivy=true -lib lightcrafts/lib zip
     - name: Build on macOS
       if: startsWith(matrix.os, 'macos')
       run: |