Skip to content

Commit f5e96e2

Browse files
wojcik91moubctez
andauthored
fix(CI): build missing service binary for MSI (#656)
* enable service cargo feature for windows builds * test build * Update * Restore KeyPath * avoid compiling service on macOS * use main.wxs * Fix main.wxs * push back expiry date * restore release workflow --------- Co-authored-by: Adam Ciarciński <adam@defguard.net>
1 parent 690a25c commit f5e96e2

9 files changed

Lines changed: 505 additions & 173 deletions

File tree

.trivyignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# glib - transitive dependency
2-
GHSA-wrw7-89jp-8q8g exp:2025-11-05
2+
GHSA-wrw7-89jp-8q8g exp:2025-12-05

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"fast-deep-equal": "^3.1.3",
7979
"file-saver": "^2.0.5",
8080
"get-text-width": "^1.0.3",
81-
"html-react-parser": "^5.2.7",
81+
"html-react-parser": "^5.2.8",
8282
"itertools": "^2.5.0",
8383
"js-base64": "^3.7.8",
8484
"lodash-es": "^4.17.21",
@@ -108,12 +108,12 @@
108108
"zustand": "^5.0.8"
109109
},
110110
"devDependencies": {
111-
"@biomejs/biome": "^2.3.2",
111+
"@biomejs/biome": "^2.3.3",
112112
"@hookform/devtools": "^4.4.0",
113113
"@svgr/cli": "^8.1.0",
114114
"@tanstack/react-query": "^5.90.6",
115115
"@tanstack/react-query-devtools": "^5.90.2",
116-
"@tauri-apps/cli": "^2.9.2",
116+
"@tauri-apps/cli": "^2.9.3",
117117
"@types/file-saver": "^2.0.7",
118118
"@types/lodash-es": "^4.17.12",
119119
"@types/node": "^24.10.0",

pnpm-lock.yaml

Lines changed: 145 additions & 164 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/resources-windows/msi/main.wxs

Lines changed: 345 additions & 0 deletions
Large diffs are not rendered by default.
-12.8 KB
Loading
-2.51 KB
Loading

src-tauri/tauri.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"componentRefs": [
3838
"DefguardServiceFragment",
3939
"ProvisioningScriptFragment"
40-
]
40+
],
41+
"template": "./resources-windows/msi/main.wxs"
4142
}
4243
},
4344
"macOS": {

src-tauri/tauri.windows.conf.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"build": {
3+
"features": [
4+
"service"
5+
]
6+
},
27
"bundle": {
38
"targets": [
49
"msi"

0 commit comments

Comments
 (0)