Update workflows

holepunchto · Jan 4, 2025 · 3df3bab · 3df3bab
1 parent 4bba513
commit 3df3bab
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml
@@ -12,33 +12,68 @@ jobs:
           - os: ubuntu-22.04-arm64
             platform: linux
             arch: arm64
+          - os: ubuntu-22.04
+            platform: android
+            arch: x64
+          - os: ubuntu-22.04
+            platform: android
+            arch: ia32
+          - os: ubuntu-22.04
+            platform: android
+            arch: arm64
+          - os: ubuntu-22.04
+            platform: android
+            arch: arm
           - os: macos-14
             platform: darwin
             arch: x64
           - os: macos-14
             platform: darwin
             arch: arm64
+          - os: macos-14
+            platform: ios
+            arch: arm64
+          - os: macos-14
+            platform: ios
+            arch: arm64
+            tags: -simulator
+            flags: --simulator
+          - os: macos-14
+            platform: ios
+            arch: x64
+            tags: -simulator
+            flags: --simulator
           - os: windows-2022
             platform: win32
             arch: x64
           - os: windows-2022
             platform: win32
             arch: arm64
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.platform }}-${{ matrix.arch }}
+    name: ${{ matrix.platform }}-${{ matrix.arch }}${{ matrix.tags }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
       - run: npm install -g bare-runtime bare-make
       - run: npm install
-      - run: bare-make generate --platform ${{ matrix.platform }} --arch ${{ matrix.arch }}
+      - run: bare-make generate --platform ${{ matrix.platform }} --arch ${{ matrix.arch }} ${{ matrix.flags }}
       - run: bare-make build
       - run: bare-make install
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.platform }}-${{ matrix.arch }}
+          name: ${{ matrix.platform }}-${{ matrix.arch }}${{ matrix.tags }}
           path: prebuilds/*
+  merge:
+    runs-on: ubuntu-latest
+    needs: prebuild
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          path: prebuilds
+          merge-multiple: true
+      - uses: actions/upload-artifact@v4
+        with:
+          name: prebuilds
+          path: prebuilds
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,8 +24,6 @@ jobs:
     name: ${{ matrix.platform }}-${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*