From 5c6566d5a0ac7d05c535cd588cc0f6fa881051ad Mon Sep 17 00:00:00 2001 From: Masahiro Kitagawa Date: Wed, 28 Feb 2024 14:37:12 +0900 Subject: [PATCH] ci(mac): Add mac m1 build --- .github/workflows/ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8a64e02..fc258db0 100644 --- 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: |