NOMERGE: fixup

tempname11 · Sep 22, 2023 · 0a9c7eb · 0a9c7eb
1 parent acc101d
commit 0a9c7eb
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,16 +14,16 @@ jobs:
         # XXX NOMERGE
         # os-type: [Windows, Linux, macOS]
         # build-type: [Debug, Release]
-        os-type: [Linux]
+        os-type: [Linux, macOS]
         build-type: [Debug]
         arch-type: [x64, arm64]
         include:
           # - os-type: Windows
           #   runner-os: windows-2022
           - os-type: Linux
             runner-os: ubuntu-22.04
-          # - os-type: macOS
-          #   runner-os: macos-12
+          - os-type: macOS
+            runner-os: macos-12
     runs-on: ${{ matrix.runner-os }}
     steps:
       - run: git config --global core.autocrlf false
@@ -55,6 +55,17 @@ jobs:
             fi
           fi
 
+          if [ "$RUNNER_OS" == "macOS" ]; then
+            if [ "${{ matrix.arch-type }}" == "arm64" ]; then
+              CROSS_FLAGS="
+                -DCMAKE_SYSTEM_NAME=Darwin
+                -DCMAKE_SYSTEM_PROCESSOR=arm64
+                -DCMAKE_C_COMPILER_TARGET=aarch64-apple-darwin
+                -DCMAKE_CXX_COMPILER_TARGET=aarch64-apple-darwin
+              "
+            fi
+          fi
+
           cmake \
             -S svf_tools \
             -B .build \
@@ -94,12 +105,15 @@ jobs:
 
           mkdir -p .package/tools/Windows_x64/
           mkdir -p .package/tools/Linux_x64/
-          mkdir -p .package/tools/macOS_x64/
+          mkdir -p .package/tools/Linux_arm64/
+          mkdir -p .package/tools/macOS_arm64/
           mkdir -p .package/runtime/src/
           mkdir -p .package/runtime/single-file
           cp .artifacts/svfc_Windows_x64_Release_*/svfc.exe .package/tools/Windows_x64/svfc.exe
           cp .artifacts/svfc_Linux_x64_Release_*/svfc .package/tools/Linux_x64/svfc
+          cp .artifacts/svfc_Linux_arm64_Release_*/svfc .package/tools/Linux_arm64/svfc
           cp .artifacts/svfc_macOS_x64_Release_*/svfc .package/tools/macOS_x64/svfc
+          cp .artifacts/svfc_macOS_arm64_Release_*/svfc .package/tools/macOS_arm64/svfc
           cp .artifacts/svfc_Linux_x64_Release_*/custom/generated/svf.h .package/runtime/single-file/
           cp -r svf_runtime/src/* .package/runtime/src/
           echo "Built at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> .package/.build-info