Merge pull request #97 from o108minmin/fix-tauri-release

fix tauri release setup
o108minmin · Jan 14, 2023 · 9b36ae6 · 9b36ae6
2 parents 7431624 + 2a0a370
commit 9b36ae6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,12 +45,12 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-          target: ${{ matrix.target }}
       - name: install dependencies (ubuntu only)
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
-      - run: cargo build --release --target ${{ matrix.target }} --all-features --workspace --exclude halberd_gui
+      - run: cargo install cross --git https://github.com/cross-rs/cross
+      - run: cross build --release --target ${{ matrix.target }} --all-features --workspace --exclude halberd_gui
       - name: Copy binary
         run: |
           cp target/${{ matrix.target }}/release/${{ matrix.artifact_name }} ./
@@ -87,9 +87,7 @@ jobs:
       with:
         node-version: 16
     - name: install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
+      uses: dtolnay/rust-toolchain@stable
     - name: install dependencies (ubuntu only)
       if: matrix.platform == 'ubuntu-latest'
       run: |

diff --git a/halberd_cli/Cargo.toml b/halberd_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "halberdcli"
-version = "2.0.3"
+version = "2.0.4"
 edition = "2021"
 authors = [
 	"o108minmin <[email protected]>",

diff --git a/halberd_core/Cargo.toml b/halberd_core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "halberd_core"
-version = "2.0.3"
+version = "2.0.4"
 edition = "2021"
 authors = [
 	"o108minmin <[email protected]>",

diff --git a/halberd_gui/package.json b/halberd_gui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "halberd_gui",
   "private": true,
-  "version": "2.0.3",
+  "version": "2.0.4",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/halberd_gui/src-tauri/Cargo.toml b/halberd_gui/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "halberd_gui"
-version = "2.0.3"
+version = "2.0.4"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

diff --git a/halberd_gui/src-tauri/tauri.conf.json b/halberd_gui/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "halberd-gui",
-    "version": "2.0.3"
+    "version": "2.0.4"
   },
   "tauri": {
     "allowlist": {