Skip to content

Commit a8b3a92

Browse files
committed
chore: Update WiX Toolset version to 5.0.2 across workflows and scripts to ensure compatibility
1 parent 516a887 commit a8b3a92

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,10 @@ jobs:
346346
- name: Install WiX Toolset
347347
shell: pwsh
348348
run: |
349-
dotnet tool install --global wix --version 6.0.2
350-
wix extension add WixToolset.Firewall.wixext/6.0.2
351-
wix extension add WixToolset.Util.wixext/6.0.2
352-
wix extension add WixToolset.Bal.wixext/6.0.2
349+
dotnet tool install --global wix --version 5.0.2
350+
wix extension add WixToolset.Firewall.wixext/5.0.2
351+
wix extension add WixToolset.Util.wixext/5.0.2
352+
wix extension add WixToolset.Bal.wixext/5.0.2
353353
354354
- name: Build MSI + Setup
355355
shell: pwsh

.github/workflows/windows-build.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on:
88
- 'Cargo.lock'
99
- 'pkg/msi/**'
1010
- '.github/workflows/windows-build.yaml'
11-
push:
12-
branches: [main]
1311

1412
permissions: {}
1513

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ release:
3131
printf "$$CHANGELOG_ENTRY\n\n" | cat - pkg/deb/debian/changelog > pkg/deb/debian/changelog.tmp && mv pkg/deb/debian/changelog.tmp pkg/deb/debian/changelog; \
3232
RPM_DATE=$$(date "+%a %b %d %Y"); \
3333
RPM_CHANGELOG_ENTRY="* $$RPM_DATE Gen0Sec <support@gen0sec.com> - $$VERSION-1\n- Release synapse $$VERSION\n- More info: https://github.com/gen0sec/synapse/releases"; \
34-
awk -v entry="$$RPM_CHANGELOG_ENTRY" '/^%changelog$$/ {print; print ""; print entry; next} {print}' pkg/rpm/synapse.spec > pkg/rpm/synapse.spec.tmp && mv pkg/rpm/synapse.spec.tmp pkg/rpm/synapse.spec; \
35-
git add Cargo.toml Cargo.lock install.sh ansible/playbook.yml ansible/group_vars/all_example.yml ansible/roles/synapse/defaults/main.yml pkg/deb/debian/changelog pkg/rpm/synapse.spec; \
34+
for spec in pkg/rpm/synapse-agent.spec pkg/rpm/synapse-proxy.spec; do \
35+
awk -v entry="$$RPM_CHANGELOG_ENTRY" '/^%changelog$$/ {print; print ""; print entry; next} {print}' $$spec > $$spec.tmp && mv $$spec.tmp $$spec; \
36+
done; \
37+
git add Cargo.toml Cargo.lock install.sh ansible/playbook.yml ansible/group_vars/all_example.yml ansible/roles/synapse/defaults/main.yml pkg/deb/debian/changelog pkg/rpm/synapse-agent.spec pkg/rpm/synapse-proxy.spec; \
3638
git commit -m "chore: release synapse $$VERSION"; \
3739
git tag v$$VERSION; \
3840
git push origin main; \

pkg/msi/build.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ if (-not (Test-Path $WpfMsi)) {
6464
}
6565

6666
# Ensure WiX extensions are installed at the version matching the WiX CLI.
67+
# Pin to 5.0.2 to match the WiX CLI version and avoid v7 OSMF EULA issues.
6768
# Remove any stale installs first so 'add' always fetches the matching version.
6869
Write-Host "Installing WiX extensions..."
70+
$WixExtVersion = "5.0.2"
6971
$wixExts = @(
7072
"WixToolset.Firewall.wixext",
7173
"WixToolset.Util.wixext",
@@ -74,7 +76,7 @@ $wixExts = @(
7476
)
7577
foreach ($ext in $wixExts) {
7678
wix extension remove $ext 2>$null
77-
wix extension add $ext
79+
wix extension add "$ext/$WixExtVersion"
7880
if ($LASTEXITCODE -ne 0) {
7981
Write-Error "Failed to install WiX extension: $ext"
8082
exit 1

0 commit comments

Comments
 (0)