fix

glzr-io · Feb 1, 2024 · 4574931 · 4574931
1 parent c480144
commit 4574931
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -34,7 +34,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8.14.1
+          version: 8
 
       - uses: actions/setup-node@v4
         with:
@@ -51,7 +51,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
         with:
-          toolchain: stable
+          toolchain: nightly
           target: ${{ matrix.target }}
       # - name: install dependencies
       #   run: |
@@ -70,21 +70,19 @@ jobs:
           sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - run: pnpm i
+      - run: pnpm build --filter zebar --filter @zebar/client
 
-      - run: |
-          pnpm build --filter zebar --filter @zebar/client
       # - run: |
       #     pnpm build --filter zebar --filter @zebar/client
       #     pnpm build --filter @zebar/desktop -- -- --target ${{ matrix.target }}
       - uses: tauri-apps/tauri-action@v0
+        id: tauri
         with:
-          projectPath: './packages/desktop'
+          projectPath: ./packages/desktop
+          args: --target ${{ matrix.target }}
 
       - uses: actions/upload-artifact@v3
         with:
           name: bundle-${{ matrix.target }}
-          path: |
-            packages/desktop/target/release/bundle/**/*.AppImage
-            packages/desktop/target/release/bundle/**/*.dmg
-            packages/desktop/target/release/bundle/**/*.deb
-            packages/desktop/target/release/bundle/**/*.msi
+          if-no-files-found: error
+          path: "${{ join(fromJSON(steps.tauri.outputs.artifactPaths), '\n') }}"
diff --git a/.github/workflows/lint-check.yaml b/.github/workflows/lint-check.yaml
@@ -10,7 +10,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8.14.1
+          version: 8
 
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,11 +20,28 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: actions/download-artifact@v4
+        with:
+          path: tmp
+          pattern: bundle-*
+          merge-multiple: true
+
       - uses: glzr-io/actions/semantic-release@main
         with:
-          is-prerelease: false
           gh-publish: true
           gh-token: ${{ secrets.GITHUB_TOKEN }}
           gh-draft-release: false
+          gh-assets: |
+            [
+              {
+                "path": "artifacts/win-x64/GlazeWM.exe",
+                "name": "GlazeWM_x64_${nextRelease.gitTag}"
+              },
+              {
+                "path": "artifacts/win-x86/GlazeWM.exe",
+                "name": "GlazeWM_x86_${nextRelease.gitTag}"
+              }
+            ]
           npm-publish: true
+          npm-token: ${{ secrets.NPM_TOKEN }}
           npm-package-root: packages/client-api
diff --git a/packages/desktop/tauri.conf.json b/packages/desktop/tauri.conf.json
@@ -25,7 +25,7 @@
       ],
       "identifier": "glazer.zebar",
       "resources": ["resources/*"],
-      "targets": "all"
+      "targets": ["deb", "appimage", "msi", "dmg", "updater"]
     },
     "macOSPrivateApi": true,
     "security": {