Skip to content

Commit 187b2fc

Browse files
author
Leonid Genkin
committed
Fix WiX installation
1 parent 575bcf1 commit 187b2fc

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

.github/workflows/build-msi.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@ jobs:
1313
- name: Cargo test
1414
run: cargo test
1515
- name: Download WiX
16-
run: curl -LS https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311.exe > $env:temp\wix311.exe
16+
shell: cmd
17+
run: curl.exe -LS https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311.exe > wix311.exe
1718
- name: Install WiX
18-
run: '"$env:temp\wix311.exe" "/install" "/quiet" "/norestart"'
19+
shell: cmd
20+
run: wix311.exe /install /quiet /norestart
1921
- name: Prepare MSI file
22+
shell: cmd
2023
run: '"%PROGRAMFILES(x86)%\WiX Toolset v3.11\bin\candle.exe" "winetd.wxs"'
2124
- name: Link MSI
22-
run: '"%PROGRAMFILES(x86)%\WiX Toolset v3.11\bin\light.exe" "winetd.wixobj" "-out" "winetd-%GITHUB_REF%.msi"'
25+
shell: cmd
26+
run: '"%PROGRAMFILES(x86)%\WiX Toolset v3.11\bin\light.exe" "winetd.wixobj" "-out" "winetd.msi"'
2327
- name: Release
2428
uses: softprops/action-gh-release@v1
2529
with:
26-
files: ${{ format('winetd-{0}.msi', github.ref) }}
30+
files: winetd.msi
2731
env:
2832
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

winetd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Directory Id='INSTALLDIR' Name='Winetd'>
1010
<Component Id='Winetd' Guid='D1E724F4-8B79-4937-BDC7-FB9EF458B6C5' Win64='yes'>
1111
<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Permanent="yes" Part="last" Action="set" System="yes" />
12-
<File Id='WinetD' Name='winetd.exe' DiskId='1' Source='target\debug\winetd.exe'>
12+
<File Id='WinetD' Name='winetd.exe' DiskId='1' Source='target\release\winetd.exe'>
1313
</File>
1414
<ServiceInstall Id='WinetdServiceInstall' Type='ownProcess' Name='Winetd'
1515
DisplayName='Winetd Service' Description='Winetd Service'

0 commit comments

Comments
 (0)