8000 fix b4 link and simplify a little more by stonebig · Pull Request #1907 · winpython/winpython · GitHub
[go: up one dir, main page]
Skip to content

fix b4 link and simplify a little more #1907

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
+5 −19
Merged

fix b4 link and simplify a little more #1907

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
24 changes: 5 additions & 19 deletions .github/workflows/github_workflows_build-2025_05.yml
View file
Open in desktop
A45F
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
REQUIREMENTS_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0dotb4.txt"
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0dotb4.txt"
REQUIREMENTS_315: ""
REQUIREMENTS_WHL_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0whlb3_wheels.txt"
REQUIREMENTS_WHL_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0whlb3_wheels.txt"
REQUIREMENTS_WHL_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0whlb4_wheels.txt"
REQUIREMENTS_WHL_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0whlb4_wheels.txt"
REQUIREMENTS_WHL_315: ""
ZIP: "0"
SEVEN_Z: "1"
Expand Down Expand Up @@ -140,7 +140,6 @@ jobs:
echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ env.my_release_level }}" >> $GITHUB_ENV

# Centralized mapping of python binaries and SHAs by version and arch.
# NOTE: fill the 3.15 URLs and SHA values when available.
# 3.13 x64 (GIL)
if [ "$PYTHON_VERSION" = "3.13" ] && [ "$WINPYARCHDET" = "64" ]; then
echo "python_source=https://github.com/astral-sh/python-build-standalone/releases/download/20251205/cpython-3.13.11+20251205-x86_64-pc-windows-msvc-install_only_stripped.tar.gz" >> $GITHUB_ENV
Expand Down Expand Up @@ -227,16 +226,8 @@ jobs:
Write-Host "Downloading Pandoc from $env:pandoc_source"
curl.exe -L -o $pandocZipPath $env:pandoc_source

Write-Host "Creating temporary directory for extraction"
mkdir -p $tempDir

Write-Host "Extracting archive to temporary directory"
Expand-Archive -Path $pandocZipPath -DestinationPath $tempDir

Write-Host "Creating final target directory: $targetDir"
if (-not (Test-Path -Path $targetDir)) {
mkdir -p $targetDir
}
Expand-Archive -Path $pandocZipPath -DestinationPath $tempDir -Force
New-Item -ItemType Directory -Path $targetDir -Force | Out-Null

Write-Host "Copying pandoc.exe to $targetDir"
Copy-Item -Path (Join-Path $tempDir "pandoc-3.1.9\pandoc.exe") -Destination $targetDir -Force
Expand All @@ -245,18 +236,14 @@ jobs:
Write-Host "Listing contents of $targetDir"
Get-ChildItem -Path $targetDir

# Calculate SHA256 hash
$expectedHash = $env:pandoc_sha256.ToLower()

$hashObject = Get-FileHash -Path $pandocZipPath -Algorithm SHA256
$actualHash = $hashObject.Hash.ToLower()
$actualHash = (Get-FileHash -Path $pandocZipPath -Algorithm SHA256).Hash.ToLower()

if ($actualHash -ne $expectedHash) {
Write-Error "Pandoc SHA mismatch: $actualHash vs expected $expectedHash"
exit 1
} else { Write-Host "Pandoc SHA ok" }

# Optional: Clean up temporary files
Write-Host "Cleaning up temporary files..."
Remove-Item -Path $tempDir -Recurse -Force
Remove-Item -Path $pandocZipPath -Force
Expand Down Expand Up @@ -286,7 +273,6 @@ jobs:
if: env.WINPYREQUIREMENTS != ''
shell: pwsh
run: |

& "$env:build_location\python\python.exe" -m pip download --dest $env:dotwheelhouse --no-deps --require-hashes -r $env:WINPYREQUIREMENTS

- name: Download additional wheelhouse requirements
Expand Down
0