Skip to content

fix(CI): build missing service binary for MSI #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wojcik91 merged 9 commits into from
Nov 5, 2025
Merged

fix(CI): build missing service binary for MSI #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
85dde51
enable service cargo feature for windows builds
wojcik91 Nov 4, 2025
e52f6bd
test build
wojcik91 Nov 4, 2025
732414e
Update
moubctez Nov 4, 2025
70fcdcb
Restore KeyPath
moubctez Nov 4, 2025
fc4d3e8
avoid compiling service on macOS
wojcik91 Nov 5, 2025
645238f
use main.wxs
moubctez Nov 5, 2025
f380710
Fix main.wxs
moubctez Nov 5, 2025
a933314
push back expiry date
wojcik91 Nov 5, 2025
1892f85
restore release workflow
wojcik91 Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# glib - transitive dependency
GHSA-wrw7-89jp-8q8g exp:2025-11-05
GHSA-wrw7-89jp-8q8g exp:2025-12-05
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"fast-deep-equal": "^3.1.3",
"file-saver": "^2.0.5",
"get-text-width": "^1.0.3",
"html-react-parser": "^5.2.7",
"html-react-parser": "^5.2.8",
"itertools": "^2.5.0",
"js-base64": "^3.7.8",
"lodash-es": "^4.17.21",
Expand Down Expand Up @@ -108,12 +108,12 @@
"zustand": "^5.0.8"
},
"devDependencies": {
"@biomejs/biome": "^2.3.2",
"@biomejs/biome": "^2.3.3",
"@hookform/devtools": "^4.4.0",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.90.6",
"@tanstack/react-query-devtools": "^5.90.2",
"@tauri-apps/cli": "^2.9.2",
"@tauri-apps/cli": "^2.9.3",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^24.10.0",
Expand Down
309 changes: 145 additions & 164 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

345 changes: 345 additions & 0 deletions src-tauri/resources-windows/msi/main.wxs
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified src-tauri/resources-windows/msi/side_banner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src-tauri/resources-windows/msi/top_banner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src-tauri/tauri.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"componentRefs": [
"DefguardServiceFragment",
"ProvisioningScriptFragment"
]
],
"template": "./resources-windows/msi/main.wxs"
}
},
"macOS": {
Expand Down
5 changes: 5 additions & 0 deletions src-tauri/tauri.windows.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"build": {
"features": [
"service"
]
},
"bundle": {
"targets": [
"msi"
Expand Down