ci: use Arm runner for MacOS arm

aminya · Sep 6, 2024 · f28944e · f28944e
1 parent 2437a21
commit f28944e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 33 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -12,9 +12,9 @@ jobs:
       matrix:
         os:
           - windows-latest
-          - macos-13
           - ubuntu-latest
-          # - macos-11 # arm64
+          - macos-13 # x86
+          - macos-14 # arm64
         d:
           - "ldc-latest"
         node:
@@ -57,35 +57,6 @@ jobs:
         with:
           compiler: ${{ matrix.d }}
 
-      - name: Setup Mac Arm64
-        shell: bash
-        if: contains(matrix.os, 'macos-13')
-        run: |
-          ARCH="arm64"
-          echo "ARCH=$ARCH" >> $GITHUB_ENV
-          echo "triple=$ARCH-apple-macos" >> $GITHUB_ENV
-          echo "DFLAGS='-mtriple=$triple -Xcc=target -Xcc=$ARCH-apple-macos'" >> $GITHUB_ENV
-          echo "CPPFLAGS=$CPPFLAGS -arch $ARCH" >> $GITHUB_ENV
-          echo "CFLAGS=$CFLAGS -arch $ARCH" >> $GITHUB_ENV
-          echo "LDFLAGS=$LDFLAGS -arch $ARCH" >> $GITHUB_ENV
-
-          # Manually install ldc
-          # Due to https://github.com/dlang-community/setup-dlang/issues/51
-          curl -LJO https://github.com/ldc-developers/ldc/releases/download/v1.28.0/ldc2-1.28.0-osx-$ARCH.tar.xz
-          tar -xf ldc2-1.28.0-osx-$ARCH.tar.xz
-          rm ldc2-1.28.0-osx-$ARCH.tar.xz
-
-          LDC_PATH="~/ldc"
-          mkdir -p $LDC_PATH
-          mv ldc2-1.28.0-osx-$ARCH $LDC_PATH
-
-          # Activate ldc
-          echo "LIBRARY_PATH=$LDC_PATH/lib${LIBRARY_PATH:+:}${LIBRARY_PATH:-}" >> $GITHUB_ENV
-          echo "LD_LIBRARY_PATH=$LDC_PATH/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}" >> $GITHUB_ENV
-          echo "PATH=$LDC_PATH/bin${PATH:+:}${PATH:-}" >> $GITHUB_ENV
-          echo "DMD=ldmd2" >> $GITHUB_ENV
-          echo "DC=ldc2" >> $GITHUB_ENV
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
@@ -104,6 +75,11 @@ jobs:
       - name: Build
         run: pnpm build.node
 
+      - name: Inspect Despacer
+        if: always()
+        shell: bash
+        run: ls ./despacer/build
+
       - name: Test
         run: pnpm test
 

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "despacer"]
 	path = despacer
-	url = https://github.com/aminya/despacer.git
-	branch = fix-dub
+	url = https://github.com/lemire/despacer.git
+	branch = master