Update

JakubMelka · Jul 3, 2024 · 27fd19e · 27fd19e
1 parent 8ea3dca
commit 27fd19e
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/.github/workflows/WindowsInstall.yml b/.github/workflows/WindowsInstall.yml
@@ -131,8 +131,8 @@ jobs:
           $version = Get-Content -Path ".\pdf4qt\build\version.txt" -Raw
           Write-Host "Version: $version"
           echo "pdf4qt_version=$version" >> $env:GITHUB_ENV
-        env:
-          pdf4qt_version: ${{ env.pdf4qt_version }}
+          echo "msipackagefilename=JakubMelka.PDF4QT_${{ version }}.msi" >> $GITHUB_ENV
+          echo "MSI package file name: JakubMelka.PDF4QT_${{ version }}.msi"
 
       - name: Find WiXUIExtension.dll
         id: find_wixui_extension
@@ -147,20 +147,13 @@ jobs:
           } else {
               Write-Error "WiXUIExtension.dll not found in the expected path."
           }
-        env:
-          wixuiextpath: ${{ env.wixuiextpath }}
-
+
       - name: Create MSI Package
         working-directory: pdf4qt\build\WixInstaller
         run: |
-          Write-Host "Current directory:"
-          Get-Location
-          Write-Host "Current directory contents:"
-          Get-ChildItem
-          candle -d"SolutionDir=." -d"SolutionExt=.sln" -d"SolutionFileName=PDF4QT.sln" -d"SolutionName=PDF4QT" -d"SolutionPath=PDF4QT.sln" -d"Configuration=Release" -d"OutDir=bin\Release\" -d"Platform=x86" -d"ProjectDir=." -d"ProjectExt=.wixproj" -d"ProjectFileName=PDF4QT.wixproj" -d"ProjectName=PDF4QT" -d"ProjectPath=PDF4QT.wixproj" -d"TargetDir=bin\Release\" -d"TargetExt=.msi" -d"TargetFileName=PDF4QT.msi" -d"TargetName=PDF4QT" -d"TargetPath=bin\Release\PDF4QT.msi" -out obj\Release\ -arch x86 -ext "${{ env.wixuiextpath }}" Product.wxs
-          Light -out .\pdf4qt\build\install\PDF4QT.msi -pdbout .\bin\Release\PDF4QT.wixpdb -cultures:null -ext "${{ env.wixuiextpath }}" -contentsfile obj\Release\PDF4QT.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\PDF4QT.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\PDF4QT.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile .\PDF4QT.wixproj obj\Release\Product.wixobj
+          candle -v -d"SolutionDir=." -d"SolutionExt=.sln" -d"SolutionFileName=PDF4QT.sln" -d"SolutionName=PDF4QT" -d"SolutionPath=PDF4QT.sln" -d"Configuration=Release" -d"OutDir=bin\Release\" -d"Platform=x86" -d"ProjectDir=." -d"ProjectExt=.wixproj" -d"ProjectFileName=PDF4QT.wixproj" -d"ProjectName=PDF4QT" -d"ProjectPath=PDF4QT.wixproj" -d"TargetDir=bin\Release\" -d"TargetExt=.msi" -d"TargetFileName=${{ env.msipackagefilename }}" -d"TargetName=PDF4QT" -d"TargetPath=bin\Release\${{ env.msipackagefilename }}" -out obj\Release\ -arch x86 -ext "${{ env.wixuiextpath }}" Product.wxs
+          Light -v -out .\pdf4qt\build\install\${{ env.msipackagefilename }} -pdbout .\bin\Release\PDF4QT.wixpdb -cultures:null -ext "${{ env.wixuiextpath }}" -contentsfile obj\Release\PDF4QT.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\PDF4QT.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\PDF4QT.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile .\PDF4QT.wixproj obj\Release\Product.wixobj
 
-          
       - name: Create MSIX Package
         run: |
           MakeAppx pack /d ".\pdf4qt\build\install\usr\bin" /p ".\pdf4qt\build\install\JakubMelka.PDF4QT_${{ env.pdf4qt_version }}.msix"
@@ -182,6 +175,6 @@ jobs:
       - name: Upload MSI package
         uses: actions/upload-artifact@v4
         with:
-          name: 'JakubMelka.PDF4QT_${{ env.pdf4qt_version }}.msi'
-          path: .\pdf4qt\build\install\PDF4QT.msi
+          name: '${{ env.msipackagefilename }}'
+          path: .\pdf4qt\build\install\${{ env.msipackagefilename }}
           retention-days: 30