Skip to content

bug fix #1909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Dec 7, 2025
Merged

bug fix #1909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions .github/workflows/github_workflows_build-2025_05.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down