Skip to content

Commit 9ecd38b

Browse files
authored
Merge pull request #381 from dwall-rs/main
rebuild 0.1.21
2 parents 856c700 + 109b110 commit 9ecd38b

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,14 @@ jobs:
138138
target/
139139
key: ${{ runner.os }}-target-${{ hashFiles('**/Cargo.lock') }}
140140

141-
- uses: dwall-rs/tauri-action@v0.5.21
141+
- uses: tauri-apps/tauri-action@v0.5.16
142142
env:
143143
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
144144
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
145145
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
146146
with:
147147
releaseId: ${{ needs.create-release.outputs.release_id }}
148-
args: ${{ matrix.args }}
149-
tauriScript: bun build:debug
148+
args: ${{ matrix.args }} --config src-tauri/tauri.debug.conf.json
150149

151150
- name: Save target
152151
id: cache-target-save

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
releaseId: ${{ needs.create-release.outputs.release_id }}
143143
releaseBody: ${{ needs.create-release.outputs.changelog }}
144144
updaterJsonPreferNsis: true
145-
args: ${{ matrix.args }}
145+
args: ${{ matrix.args }} --features log-max-level-info
146146

147147
- name: Save target
148148
id: cache-target-save

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"build:daemon-dev": "cargo build -p dwall --features build-script,log-color",
1010
"build:daemon-debug": "cargo build -p dwall --release --features build-script",
1111
"build:daemon-stage": "cargo build -p dwall --release --features log-color,build-script",
12-
"build:debug": "bun run build:daemon-debug && tauri build --config src-tauri/tauri.release.conf.json",
13-
"build": "bun run build:daemon && tauri build --config src-tauri/tauri.release.conf.json --features log-max-level-info",
12+
"build:debug": "tauri build --config src-tauri/tauri.debug.conf.json",
13+
"build": "tauri build --features log-max-level-info",
1414
"tauri": "tauri",
1515
"start": "vite",
1616
"start:dev": "cross-env RUST_BACKTRACE=1 tauri dev --features log-color",

src-tauri/tauri.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"build": {
77
"beforeDevCommand": "bun run start",
88
"devUrl": "http://localhost:1420",
9-
"beforeBuildCommand": "bun run build:vite",
9+
"beforeBuildCommand": "bun run build:vite && bun run build:daemon",
1010
"frontendDist": "../dist"
1111
},
1212
"app": {
@@ -19,6 +19,7 @@
1919
}
2020
},
2121
"bundle": {
22+
"resources": { "../target/release/dwall.exe": "dwall.exe" },
2223
"active": true,
2324
"copyright": "Copyright (C) 2025 thep0y. All rights reserved.",
2425
"createUpdaterArtifacts": true,

src-tauri/tauri.debug.conf.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://schema.tauri.app/config/2",
3+
"build": {
4+
"beforeBuildCommand": "bun run build:vite && bun run build:daemon-debug"
5+
}
6+
}

src-tauri/tauri.release.conf.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)