Merge arm64+x86 musl builds

ranisalt · Aug 3, 2024 · 693ab10 · 693ab10
1 parent 5ca3228
commit 693ab10
Showing 1 changed file with 14 additions and 36 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -88,9 +88,17 @@ jobs:
           name: prebuild-linux-arm64-glibc
           path: prebuilds/**/*.node
 
-  build-linux-x64-musl:
-    name: Build for linux-x64-musl
-    runs-on: ubuntu-latest
+  build-linux-musl:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            arch: x64-musl
+          - os: macos-latest
+            arch: arm64-musl
+
+    name: Build for linux-${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
 
     container:
       image: node:20-alpine
@@ -113,36 +121,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: prebuild-linux-x64-musl
-          path: prebuilds/**/*.node
-
-  build-linux-arm64-musl:
-    name: Build for linux-arm64-musl
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Prebuild
-        uses: uraimo/run-on-arch-action@v2
-        with:
-          arch: aarch64
-          distro: alpine_latest
-          dockerRunArgs: --volume "${PWD}:/repo" --workdir /repo
-          install: |
-            apk add --update make g++ python3
-            apk add --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/v3.19/main/ nodejs~=20 yarn
-          run: |
-            yarn install --frozen-lockfile --ignore-scripts
-            yarn build
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: prebuild-linux-arm64-musl
+          name: prebuild-linux-musl
           path: prebuilds/**/*.node
 
   build-freebsd-x64:
@@ -178,8 +157,7 @@ jobs:
       - build
       - build-freebsd-x64
       - build-linux-arm64-glibc
-      - build-linux-arm64-musl
-      - build-linux-x64-musl
+      - build-linux-musl
 
     steps:
       - name: Checkout
@@ -195,7 +173,7 @@ jobs:
         run: mkdir prebuilds && cp --recursive prebuild-*/* prebuilds/
 
       - name: Pack package
-        run: yarn pack
+        run: yarn prepare && yarn pack
 
       - name: Upload package artifact
         uses: actions/upload-artifact@v4