Actions fix

Yubico · Sep 17, 2020 · c8df1c2 · c8df1c2
1 parent 39f0081
commit c8df1c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
@@ -122,14 +122,14 @@ jobs:
       - name: DPI awareness
         shell: powershell
         run: |
-          cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\"
-          ls
+          $env:PATH += ";C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64"
+          mt.exe -manifest .\resources\win\yubioath-desktop.exe.manifest -outputresource:.\release\yubioath-desktop.exe
 
       - name: Create an unsigned .msi installer package
         run: |
           $env:PATH += ";$env:WIX\bin"
           $env:SRCDIR = ".\release\"
-          $env:MERGEDPATH = Get-ChildItem "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\MergeModules\Microsoft_VC142_CRT_x64.msm"
+          $env:MERGEDPATH = Get-ChildItem "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.*\MergeModules\Microsoft_VC142_CRT_x64.msm"
           heat dir .\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
           light fragment.wixobj yubioath-desktop.wixobj -ext WixUIExtension -ext WixUtilExtension -o yubioath-desktop.msi

diff --git a/.github/workflows/windows-x86.yml b/.github/workflows/windows-x86.yml
@@ -3,7 +3,7 @@ name: windows 32bit
 on: [push, pull_request]
 
 env:
-  PYTHON_VER: '3.8.3'
+  PYTHON_VER: '3.8.5'
   PYTHON_VER_DIRNAME: 'python38'
   PYOTHERSIDE_VER: '1.5.9'