[CI] fix macOS CI

Author: Arthapz

.github/workflows/macOS.yml

@@ -17,9 +17,9 @@ on:
   push:
     branches: [develop]
     paths-ignore:
+      - '.github/workflows/Windows-LLVM.yml'
       - '.github/workflows/Windows-MSVC.yml'
       - '.github/workflows/Linux.yml'
-      - '.github/workflows/macOS.yml'
       - '.github/workflows/iOS.yml'
       - '.github/workflows/Android.yml'
       - '.github/workflows/AutoMerger.yml'
@@ -36,7 +36,7 @@ jobs:
       matrix:
         os: [macOS-latest]
         kind: [static, shared]
-        mode: [release, debug, asan]
+        mode: [release, debug]
 
     runs-on: ${{ matrix.os }}
 
@@ -53,22 +53,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache LLVM
-        id: cache_llvm
-        uses: actions/cache@v4
-        with:
-          path: ${{ runner.workspace }}/StormKit/llvm
-          key: ${{ matrix.os }}-llvm
-          save-always: true
-          restore-keys: |
-            ${{ matrix.os }}-llvm
-
-      - name: Download and Uncompress LLVM
-        if: ${{ steps.cache_llvm.outputs.cache-hit != 'true' }}
-        run: |
-          wget 'https://github.com/Arthapz/llvm-prebuilt/raw/main/macOS/llvm.7z.001'
-          7z x llvm.7z.001
-          rm llvm.7z.001
+      - name: Install llvm
+        run: brew install llvm
 
       - name: Set xmake env
         run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
@@ -79,9 +65,6 @@ jobs:
           xmake-version: branch@dev
           actions-cache-folder: .xmake-cache-${{ steps.cache_key.outputs.key }}
 
-      - name: Update xmake to patched xmake
-        run: xmake update -s https://github.com/Arthapz/xmake.git#modules
-
       - name: Update xmake repository
         run: xmake repo --update -v
 
@@ -98,18 +81,18 @@ jobs:
       - name: Configure & Build
         id: build
         run: |
-          xmake f -v --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'asan' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --sdk="${{ runner.workspace }}/StormKit/llvm/" --runtimes="c++_shared"
+          xmake f -v --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'debug' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --sdk="/opt/homebrew/opt/llvm/" --runtimes="c++_shared"
           xmake b -v
 
       - name: Tests
-        run: DYLD_LIBRARY_PATH="${{ runner.workspace }}/StormKit/llvm/lib" xmake test -v
+        run: xmake test -v
 
       - name: Installation
         run: xmake install -v --installdir="${{ runner.workspace }}/output"
 
       - name: Upload artifacts
         id: upload
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: macOS-x64-${{ matrix.kind }}-${{ matrix.mode }}
           path: ${{ runner.workspace }}/output

xmake.lua

@@ -287,7 +287,7 @@ option("vsxmake", { default = false, category = "root menu/support" })
 ---------------------------- global configs ----------------------------
 set_allowedmodes(allowedmodes)
 set_allowedplats("windows", "mingw", "linux", "macosx", "wasm")
-set_allowedarchs("windows|x64", "mingw|x86_64", "linux|x86_64", "macosx|x86_64")
+set_allowedarchs("windows|x64", "mingw|x86_64", "linux|x86_64", "linux|aarch64", "macosx|x86_64", "macosx|arm64")
 
 -- set_runtimes(is_mode("debug") and "MDd" or "MD")
 add_cxxflags(