From 28906352f4ed308db8b3f012511a5180b830990b Mon Sep 17 00:00:00 2001 From: Guyutongxue Date: Tue, 27 Feb 2024 21:30:02 +0800 Subject: [PATCH 1/6] try add wix patch --- src-tauri/add_to_path.wxs | 5 +++++ src-tauri/tauri.conf.json | 1 + 2 files changed, 6 insertions(+) create mode 100644 src-tauri/add_to_path.wxs diff --git a/src-tauri/add_to_path.wxs b/src-tauri/add_to_path.wxs new file mode 100644 index 0000000..a590b95 --- /dev/null +++ b/src-tauri/add_to_path.wxs @@ -0,0 +1,5 @@ + + + + + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7278fb1..ac6c188 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -41,6 +41,7 @@ "digestAlgorithm": "sha256", "timestampUrl": "", "wix": { + "fragmentPaths": ["./add_to_path.wxs"], "language": "zh-CN", "license": "../LICENSE" } From 63170ae68b06a2dcccab8061a1290b9f1b6c53ad Mon Sep 17 00:00:00 2001 From: Guyutongxue Date: Tue, 27 Feb 2024 21:49:02 +0800 Subject: [PATCH 2/6] make ci verbose --- .github/workflows/tauri.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tauri.yml b/.github/workflows/tauri.yml index c5acf57..b2bd563 100644 --- a/.github/workflows/tauri.yml +++ b/.github/workflows/tauri.yml @@ -42,7 +42,7 @@ jobs: sudo apt update sudo apt install -y libwebkit2gtk-4.0-dev libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev - run: pnpm install - - run: pnpm tauri build + - run: pnpm tauri build -- --verbose - uses: actions/upload-artifact@v3 with: name: ${{ runner.os }} executable From 7e9e2eaf44eb949f0da37d56babaaddf395bf8ef Mon Sep 17 00:00:00 2001 From: Guyutongxue Date: Tue, 27 Feb 2024 22:07:57 +0800 Subject: [PATCH 3/6] try again --- .github/workflows/tauri.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tauri.yml b/.github/workflows/tauri.yml index b2bd563..3017a98 100644 --- a/.github/workflows/tauri.yml +++ b/.github/workflows/tauri.yml @@ -42,7 +42,7 @@ jobs: sudo apt update sudo apt install -y libwebkit2gtk-4.0-dev libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev - run: pnpm install - - run: pnpm tauri build -- --verbose + - run: pnpm tauri build --verbose - uses: actions/upload-artifact@v3 with: name: ${{ runner.os }} executable From e0b6ad5ef4380c18596747a3c62ec939d4e7cc98 Mon Sep 17 00:00:00 2001 From: Guyutongxue Date: Tue, 27 Feb 2024 22:23:26 +0800 Subject: [PATCH 4/6] add Wix root --- src-tauri/add_to_path.wxs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src-tauri/add_to_path.wxs b/src-tauri/add_to_path.wxs index a590b95..9a61ddb 100644 --- a/src-tauri/add_to_path.wxs +++ b/src-tauri/add_to_path.wxs @@ -1,5 +1,9 @@ - - - - - + + + + + + + + From 549d39ee5b391553e4efdd2f3638dc38db071f7f Mon Sep 17 00:00:00 2001 From: Guyutongxue Date: Tue, 27 Feb 2024 22:38:47 +0800 Subject: [PATCH 5/6] add DirectoryRef --- src-tauri/add_to_path.wxs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src-tauri/add_to_path.wxs b/src-tauri/add_to_path.wxs index 9a61ddb..25b2669 100644 --- a/src-tauri/add_to_path.wxs +++ b/src-tauri/add_to_path.wxs @@ -1,9 +1,11 @@ - - - + + + + + From 6168afbe73dfd64adb9706df3d6d712705c3bf90 Mon Sep 17 00:00:00 2001 From: Guyutongxue Date: Tue, 27 Feb 2024 22:49:13 +0800 Subject: [PATCH 6/6] ref components from conf --- src-tauri/tauri.conf.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ac6c188..59941a1 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -42,6 +42,7 @@ "timestampUrl": "", "wix": { "fragmentPaths": ["./add_to_path.wxs"], + "componentRefs": ["AddToPath"], "language": "zh-CN", "license": "../LICENSE" }