ci: use matrix build

webmeshproj · Nov 5, 2023 · 4ced1c2 · 4ced1c2
1 parent 21947a6
commit 4ced1c2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 35 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,12 +8,21 @@ on:
 
 env:
   WEBMESH_VERSION: main
-  CACHE_DEP_PATH: yarn.lock
 
 jobs:
   build:
-    name: Build
-    runs-on: ${{ vars.BUILD_PLATFORM == '' && 'ubuntu-latest' || vars.BUILD_PLATFORM }}
+    name: Build Package
+    strategy:
+      matrix:
+        target: [linux, mac, win]
+        include:
+          - target: linux
+            runner: ${{ vars.LINUX_BUILD_PLATFORM }}
+          - target: mac
+            runner: ${{ vars.MACOS_BUILD_PLATFORM }}
+          - target: win
+            runner: ${{ vars.WINDOWS_BUILD_PLATFORM }}
+    runs-on: ${{ matrix.runner }}
     permissions:
       contents: 'read'
       id-token: 'write'
@@ -36,7 +45,7 @@ jobs:
         with:
           go-version: stable
           check-latest: true
-          cache: ${{ !startswith(vars.BUILD_PLATFORM, 'self-hosted') }}
+          cache: ${{ !startswith(matrix.runner, 'self-hosted') }}
           cache-dependency-path: webmesh/go.sum
 
       - name: Setup Node
@@ -45,24 +54,13 @@ jobs:
           check-latest: true
           node-version-file: .nvmrc
 
-      - name: Install Wine on Hosted Ubuntu Runners
-        if: ${{ startswith(vars.BUILD_PLATFORM, 'ubuntu') }}
-        run: |
-          set -ex
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt-get install -y wine64 wine32
-
-      - name: Install UPX on Hosted macOS Runners
-        if: ${{ startswith(vars.BUILD_PLATFORM, 'macos') }}
-        run: brew install upx
-
-      - name: Build Webmesh Daemon
+      - name: Build Webmesh Helper Daemon
+        if: ${{ matrix.target != 'linux' }}
         env:
           PARALLEL: 6
         run: cd webmesh && make dist-webmeshd
 
       - name: Build Electron App
         env:
           GH_TOKEN: ${{ github.token }}
-        run: yarn && yarn build:all
+        run: yarn && yarn build:${{ matrix.target }}
diff --git a/...ude/darwin/com.webmeshproj.webmeshd.plist → ...rib/darwin/com.webmeshproj.webmeshd.plist b/...ude/darwin/com.webmeshproj.webmeshd.plist → ...rib/darwin/com.webmeshproj.webmeshd.plist
diff --git a/include/darwin/components.plist → contrib/darwin/components.plist b/include/darwin/components.plist → contrib/darwin/components.plist
diff --git a/include/darwin/postinstall → contrib/darwin/postinstall b/include/darwin/postinstall → contrib/darwin/postinstall
diff --git a/include/darwin/preinstall → contrib/darwin/preinstall b/include/darwin/preinstall → contrib/darwin/preinstall
diff --git a/include/windows/webmesh.wxs → contrib/windows/webmesh.wxs b/include/windows/webmesh.wxs → contrib/windows/webmesh.wxs
diff --git a/include/linux/webmeshd.service b/include/linux/webmeshd.service
diff --git a/package.json b/package.json
@@ -11,6 +11,9 @@
     "test": "echo \"No test specified\" && exit 0",
     "dev": "quasar dev --mode electron",
     "build": "rm -rf dist/ ; quasar build --modern --mode electron",
+    "build:win": "rm -rf dist/ ; quasar build --modern --mode electron --target win",
+    "build:mac": "rm -rf dist/ ; quasar build --modern --mode electron --target mac",
+    "build:linux": "rm -rf dist/ ; quasar build --modern --mode electron --target linux",
     "build:all": "rm -rf dist/ ; quasar build --modern --mode electron --target all",
     "clean": "rm -rf dist/ node_modules/ && yarn"
   },