Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-12-23 02:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

windows release fixes part 2

Browse Source
This commit is contained in:
Dennis Fokin 2022-11-11 12:55:00 +01:00
parent 79ceeffdc4
commit 0b055ddc17
No known key found for this signature in database
GPG Key ID: 870B88256690D8BC
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/windows.yml vendored
View File

@ -61,8 +61,6 @@ jobs:
run: | run: |
$env:PATH += ";$env:WIX\bin" $env:PATH += ";$env:WIX\bin"
$env:SRCDIR = "build\windows\runner\Release\" $env:SRCDIR = "build\windows\runner\Release\"
cp resources\win\license.rtf .
cp resources\win\yubioath-desktop.wxs .
heat dir .\build\windows\runner\Release\ -out fragment.wxs -gg -scom -srd -sfrag -dr INSTALLDIR -cg ApplicationFiles -var env.SRCDIR heat dir .\build\windows\runner\Release\ -out fragment.wxs -gg -scom -srd -sfrag -dr INSTALLDIR -cg ApplicationFiles -var env.SRCDIR
candle .\fragment.wxs .\resources\win\yubioath-desktop.wxs -ext WixUtilExtension -arch x64 candle .\fragment.wxs .\resources\win\yubioath-desktop.wxs -ext WixUtilExtension -arch x64
light fragment.wixobj yubioath-desktop.wixobj -ext WixUIExtension -ext WixUtilExtension -o yubioath-desktop.msi light fragment.wixobj yubioath-desktop.wixobj -ext WixUIExtension -ext WixUtilExtension -o yubioath-desktop.msi
@ -75,9 +73,8 @@ jobs:
mkdir $dest mkdir $dest
mv build\windows\runner\Release\* $dest\ mv build\windows\runner\Release\* $dest\
mv yubioath-desktop.msi deploy mv yubioath-desktop.msi deploy
mv resources\win\yubioath-desktop.wxs deploy
mv resources\win\release-win.ps1 deploy mv resources\win\release-win.ps1 deploy
mv resources\win\license.rtf deploy mv resources deploy
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3

4
resources/win/release-win.ps1
View File

@ -1,4 +1,4 @@
$version=6.0.1-dev.1 $version="6.0.1-dev.1"
echo "Renaming the Actions folder and moving it" echo "Renaming the Actions folder and moving it"
mv yubioath-desktop-* release mv yubioath-desktop-* release
@ -10,7 +10,7 @@ signtool.exe sign /fd SHA256 /t http://timestamp.digicert.com/scripts/timstamp.d
echo "Setting env var and building installer" echo "Setting env var and building installer"
$env:SRCDIR = ".\release\" $env:SRCDIR = ".\release\"
heat dir .\release -out fragment.wxs -gg -scom -srd -sfrag -dr INSTALLDIR -cg ApplicationFiles -var env.SRCDIR heat dir .\release -out fragment.wxs -gg -scom -srd -sfrag -dr INSTALLDIR -cg ApplicationFiles -var env.SRCDIR
candle .\fragment.wxs yubioath-desktop.wxs -ext WixUtilExtension -arch x64 candle .\fragment.wxs resources/win/yubioath-desktop.wxs -ext WixUtilExtension -arch x64
light fragment.wixobj yubioath-desktop.wixobj -ext WixUIExtension -ext WixUtilExtension -o yubioath-desktop-$version-win64.msi light fragment.wixobj yubioath-desktop.wixobj -ext WixUIExtension -ext WixUtilExtension -o yubioath-desktop-$version-win64.msi
echo "Signing the installer" echo "Signing the installer"

2
resources/win/yubioath-desktop.wxs
View File

@ -10,7 +10,7 @@
<WixVariable Id="WixUIDialogBmp" Value="resources\icons\yubico-msi-background.png" /> <WixVariable Id="WixUIDialogBmp" Value="resources\icons\yubico-msi-background.png" />
<WixVariable Id="WixUIBannerBmp" Value="resources\icons\yubico-msi-y-banner.png" /> <WixVariable Id="WixUIBannerBmp" Value="resources\icons\yubico-msi-y-banner.png" />
<WixVariable Id="WixUILicenseRtf" Value="license.rtf" /> <WixVariable Id="WixUILicenseRtf" Value="resources\win\license.rtf" />
<Icon Id="icon.ico" SourceFile="resources\icons\com.yubico.yubioath.ico"/> <Icon Id="icon.ico" SourceFile="resources\icons\com.yubico.yubioath.ico"/>
<Property Id="ARPPRODUCTICON" Value="icon.ico" /> <Property Id="ARPPRODUCTICON" Value="icon.ico" />

4
set-version.py
View File

@ -133,8 +133,8 @@ def update_helper_version(buf):
# release-win.ps1 # release-win.ps1
def update_release_win(buf): def update_release_win(buf):
return sub1( return sub1(
rf'\$version={version_pattern}', rf'\$version="{version_pattern}"',
f'$version={version}', f'$version="{version}"',
buf, buf,
) )