Merge pull request #1909 from stonebig/master

stonebig · web-flow · commit f534d1babb44 · 2025-12-07T16:03:13.000+01:00
bug fix
diff --git a/.github/workflows/github_workflows_build-2025_05.yml b/.github/workflows/github_workflows_build-2025_05.yml
@@ -172,7 +172,7 @@ jobs:
           curl.exe -L -o "python-3-embed.tar.gz" $env:python_source
 
           $expectedHash = $env:python_sha256
-          $actualHash = (Get-FileHash -Path "python-3-embed.tar.gz" -Algorithm SHA256).Hash.ToLower()          $actualHash = $hashObject.Hash.ToLower()
+          $actualHash = (Get-FileHash -Path "python-3-embed.tar.gz" -Algorithm SHA256).Hash.ToLower()
           if ($actualHash -ne $expectedHash.ToLower()) {
             Write-Error "SHA mismatch: Actual $actualHash doesn't match $expectedHash"
             exit 1
@@ -219,16 +219,6 @@ jobs:
           Write-Host "Downloading Pandoc from $env:pandoc_source"
           curl.exe -L -o $pandocZipPath $env:pandoc_source
           
-          Expand-Archive -Path $pandocZipPath -DestinationPath $tempDir -Force
-          New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
-          
-          Write-Output "Copying pandoc.exe to $targetDir"
-          Copy-Item -Path (Join-Path $tempDir "pandoc-3.1.9\pandoc.exe") -Destination $targetDir -Force         
-
-          # Optional: Verify the contents
-          Write-Output "Listing contents of $targetDir"
-          Get-ChildItem -Path $targetDir
-
           $expectedHash = $env:pandoc_sha256.ToLower()
           $actualHash = (Get-FileHash -Path $pandocZipPath -Algorithm SHA256).Hash.ToLower()
 
@@ -237,6 +227,15 @@ jobs:
               exit 1
           } else { Write-Output "Pandoc SHA ok" }
 
+          Expand-Archive -Path $pandocZipPath -DestinationPath $tempDir -Force
+          New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
+          
+          Write-Output "Copying pandoc.exe to $targetDir"
+          Copy-Item -Path (Join-Path $tempDir "pandoc-3.1.9\pandoc.exe") -Destination $targetDir -Force         
+
+          Write-Output "Showing the content of $targetDir"
+          Get-ChildItem -Path $targetDir
+
           Write-Output "Cleaning up temporary files..."
           Remove-Item -Path $tempDir -Recurse -Force
           Remove-Item -Path $pandocZipPath -Force
@@ -311,7 +310,6 @@ jobs:
           & "$env:build_location\python\python.exe" -X utf8 -c "from wppm import wheelhouse as wh; wh.pylock_to_req(r'$destfile_pylockwheel', r'$outreqwheel')"
           Copy-Item -Path $outreqwheel -Destination (Join-Path  $env:build_location "wheelhouse") -Force         
           Copy-Item -Path $destfile_pylockwheel -Destination (Join-Path  $env:build_location "wheelhouse") -Force         
-
           }
 
       - name: Zip the result
@@ -347,7 +345,6 @@ jobs:
           & "$env:build_location\python\python.exe" -c "import sys;from wppm import hash; hash.print_hashes(sys.argv[1:])" @($filesToHash.FullName) | Out-File -FilePath $DESTFILE
           gc $DESTFILE
 
-      # Example artifact upload step (optional)
       - name: Upload artifacts
         if: env.WINPYREQUIREMENTS != ''
         uses: actions/upload-artifact@v4
