8000 cloud build take the normal names now · winpython/winpython@71e1485 · GitHub
[go: up one dir, main page]

Skip to content

Commit 71e1485

Browse files
committed
cloud build take the normal names now
1 parent 30b3c5d commit 71e1485

File tree

2 files changed

+34
-20
lines changed

2 files changed

+34
-20
lines changed

.github/workflows/github_workflows_build-all_3.13.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,55 @@ jobs:
1717
# Define different WinPython build configurations
1818
flavor_config:
1919
# WinPython Dot configuration
20-
- FLAVOR: "dotc"
20+
- FLAVOR: "dot"
2121
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt"
2222
REQUIREMENTS_WHL: ""
2323
ZIP: "1"
2424
SEVEN_Z: "0"
2525
EXE: "1"
2626
PANDOC: "0"
27-
ARTIFACT_NAME: "publish_313dotc"
27+
ARTIFACT_NAME: "publish_313dot"
2828
python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.13.7+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
2929
python_sha256f: "d60173a7693c3134b8364814b80f98ddde0638e0e75e5b004f37452fccf67a33"
3030
WINPYARCH: "64"
3131
WINPYVERSION: "313"
3232
WINPYVER2: "3.13.7.0"
33-
my_release_level: "b3"
34-
build_location: "WPy64-3170b3"
33+
my_release_level: "b4"
34+
build_location: "WPy64-3170b4"
3535

3636
# WinPython Slim configuration
37-
- FLAVOR: "slimc"
37+
- FLAVOR: "slim"
3838
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0slimb4.txt"
3939
REQUIREMENTS_WHL: ""
4040
ZIP: "0"
4141
SEVEN_Z: "1"
4242
EXE: "1"
4343
PANDOC: "1"
44-
ARTIFACT_NAME: "publish_313slimc"
44+
ARTIFACT_NAME: "publish_313slim"
4545
python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.13.7+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
4646
python_sha256f: "d60173a7693c3134b8364814b80f98ddde0638e0e75e5b004f37452fccf67a33"
4747
WINPYARCH: "64"
4848
WINPYVERSION: "313"
4949
WINPYVER2: "3.13.7.0"
50-
my_release_level: "b3"
51-
build_location: "WPy64-3170b3"
50+
my_release_level: "b4"
51+
build_location: "WPy64-3170b4"
5252

5353
# WinPython Whl configuration
5454
- FLAVOR: "whlc"
55-
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt" # Note: Original whl used dotb3 requirements, verify if this is intended
55+
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt" # Note: Original whl used dot requirements, verify if this is intended
5656
REQUIREMENTS_WHL: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0whlb4_wheels.txt"
5757
ZIP: "0"
5858
SEVEN_Z: "1"
5959
EXE: "0"
6060
PANDOC: "0"
61-
ARTIFACT_NAME: "publish_313whlc"
61+
ARTIFACT_NAME: "publish_313whl"
6262
python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.13.7+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
6363
python_sha256f: "d60173a7693c3134b8364814b80f98ddde0638e0e75e5b004f37452fccf67a33"
6464
WINPYARCH: "64"
6565
WINPYVERSION: "313"
6666
WINPYVER2: "3.13.7.0"
67-
my_release_level: "b3"
68-
build_location: "WPy64-3170b3"
67+
my_release_level: "b4"
68+
build_location: "WPy64-3170b4"
6969

7070
steps:
7171
- name: Checkout repository

.github/workflows/github_workflows_build-all_3.14.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,38 @@ jobs:
1717
# Define different WinPython build configurations
1818
flavor_config:
1919
# WinPython Dot configuration
20-
- FLAVOR: "dotc"
20+
- FLAVOR: "dot"
2121
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_14_0_1dotb3.txt"
2222
REQUIREMENTS_WHL: ""
2323
ZIP: "1"
2424
SEVEN_Z: "0"
2525
EXE: "1"
2626
PANDOC: "0"
27-
ARTIFACT_NAME: "publish_314dotc"
27+
ARTIFACT_NAME: "publish_314dot"
2828
python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.14.0rc2+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
2929
python_sha256f: "361a49531a5d4bdc72bbccc81f7b5881b5eb751e3b47683b233cacae5aeeaeed"
3030
WINPYARCH: "64"
3131
WINPYVERSION: "314"
3232
WINPYVER2: "3.14.0.1"
33-
my_release_level: "b3"
34-
build_location: "WPy64-31401b3"
33+
my_release_level: "b4"
34+
build_location: "WPy64-31401b4"
3535

36-
- FLAVOR: "freec"
36+
37+
- FLAVOR: "free"
3738
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_14_0_1dotb3.txt"
3839
REQUIREMENTS_WHL: ""
3940
ZIP: "1"
4041
SEVEN_Z: "0"
4142
EXE: "1"
4243
PANDOC: "0"
43-
ARTIFACT_NAME: "publish_314freec"
44+
ARTIFACT_NAME: "publish_314free"
4445
python_sourcef: "https://github.com/winpython/winpy.github.io/releases/download/20250825/cpython-3.14.0rc2+20250825-x86_64-pc-windows-msvc-freethreaded-install_only_stripped.tar.gz"
4546
python_sha256f: "dda491993214ae78948297848aa9d75d1d10762c33ff16487793ca5205516e4a"
4647
WINPYARCH: "64"
4748
WINPYVERSION: "314"
4849
WINPYVER2: "3.14.0.1"
49-
my_release_level: "b3"
50-
build_location: "WPy64-31401b3"
50+
my_release_level: "b4"
51+
build_location: "WPy64-31401b4"
5152

5253
steps:
5354
- name: Checkout repository
@@ -264,6 +265,19 @@ jobs:
264265
$outreq = "publish_output\requir.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_').txt"
265266
& "$env:build_location\python\python.exe" -X utf8 -c "from wppm import wheelhouse as wh; wh.pylock_to_req(r'$destfile_pylock', r'$outreq')"
266267
268+
if ($env:WINPYrequirementswhl -eq "") {
269+
Write-Output "No additional wheelhouse requirements."
270+
} else {
271+
$destfile_pylockwheel = "publish_output\pylock.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_')_wheels.toml"
272+
& "$env:build_location\python\python.exe" -m pip lock --no-deps --require-hashes -r $env:WINPYrequirementswhl -o $destfile_pylockwheel
273+
274+
$outreqwheel = "publish_output\requir.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_')_wheels.txt"
275+
& "$env:build_location\python\python.exe" -X utf8 -c "from wppm import wheelhouse as wh; wh.pylock_to_req(r'$destfile_pylockwheel', r'$outreqwheel')"
276+
Copy-Item -Path $outreqwheel -Destination (Join-Path $env:build_location "wheelhouse") -Force
277+
Copy-Item -Path $destfile_pylockwheel -Destination (Join-Path $env:build_location "wheelhouse") -Force
278+
279+
}
280+
267281
- name: Zip the result
268282
shell: pwsh
269283
if: ${{ matrix.flavor_config.ZIP == '1' }}

0 commit comments

Comments
 (0)
0