Skip to content

Commit 323bde5

Browse files
stonebigstonebig
authored
Merge pull request #1906 from stonebig/master
simplify github action
2 parents 2968685 + ee66c0c commit 323bde5

File tree

1 file changed

+12
-51
lines changed

1 file changed

+12
-51
lines changed

‎.github/workflows/github_workflows_build-2025_05.yml‎

Lines changed: 12 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
PANDOC: "0"
3434
WINPYARCH: "64"
3535
WINPYARCHDET: "64"
36-
my_release_level: "b4"
3736
- name: "slim"
3837
REQUIREMENTS_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0slimb4.txt"
3938
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0slimb4.txt"
@@ -47,7 +46,6 @@ jobs:
4746
PANDOC: "1"
4847
WINPYARCH: "64"
4948
WINPYARCHDET: "64"
50-
my_release_level: "b4"
5149
- name: "whl"
5250
REQUIREMENTS_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0dotb4.txt"
5351
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0dotb4.txt"
@@ -61,7 +59,6 @@ jobs:
6159
PANDOC: "0"
6260
WINPYARCH: "64"
6361
WINPYARCHDET: "64"
64-
my_release_level: "b4"
6562
- name: "free"
6663
REQUIREMENTS_313: ""
6764
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0freeb4.txt"
@@ -75,7 +72,6 @@ jobs:
7572
PANDOC: "0"
7673
WINPYARCH: "64"
7774
WINPYARCHDET: "64F"
78-
my_release_level: "b4"
7975
- name: "slimf"
8076
REQUIREMENTS_313: ""
8177
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0slimfb4.txt"
@@ -89,12 +85,18 @@ jobs:
8985
PANDOC: "1"
9086
WINPYARCH: "64"
9187
WINPYARCHDET: "64F"
92-
my_release_level: "b4"
9388

9489
env:
9590
PYTHON_VERSION: ${{ github.event.inputs.python_version }}
96-
FLAVOR: ${{ matrix.flavor.name }}
91+
WINPYFLAVOR: ${{ matrix.flavor.name }}
92+
PANDOC: ${{ matrix.flavor.PANDOC }}
93+
WINPYZIP: ${{ matrix.flavor.ZIP }}
94+
WINPY7Z: ${{ matrix.flavor.SEVEN_Z }}
95+
WINPYEXE: ${{ matrix.flavor.EXE }}
96+
WINPYARCH: ${{ matrix.flavor.WINPYARCH }}
97+
WINPYARCHDET: ${{ matrix.flavor.WINPYARCHDET }}
9798
# constants
99+
my_release_level: "b4"
98100
dotwheelhouse: dotpython\\wheelhouse\\included.wheels
99101
pandoc_source: "https://github.com/jgm/pandoc/releases/download/3.1.9/pandoc-3.1.9-windows-x86_64.zip"
100102
pandoc_sha256: "11eb6dbe5286c9e5edb0cca4412e7d99ec6578ec04158b0b7fe11f7fd96688e5"
@@ -106,10 +108,8 @@ jobs:
106108
- name: Set static and matrix variables based on selected Python version
107109
shell: bash
108110
run: |
109-
PYTHON_VERSION="${{ github.event.inputs.python_version }}"
110-
FLAVOR="${{ matrix.flavor.name }}"
111-
WINPYARCH="${{ matrix.flavor.WINPYARCH }}"
112-
WINPYARCHDET="${{ matrix.flavor.WINPYARCHDET }}"
111+
PYTHON_VERSION="${{ env.PYTHON_VERSION }}"
112+
WINPYARCHDET="${{ env.WINPYARCHDET }}"
113113
114114
# Populate generic per-flavor / per-version selections
115115
if [ "$PYTHON_VERSION" = "3.13" ]; then
@@ -134,19 +134,10 @@ jobs:
134134
135135
# write common flavor env vars
136136
echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV
137-
echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV
137+
echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${{ matrix.flavor.name }}" >> $GITHUB_ENV
138138
echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV
139139
echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV
140-
echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV
141-
142-
echo "WINPYARCH=$WINPYARCH" >> $GITHUB_ENV
143-
echo "WINPYARCHDET=$WINPYARCHDET" >> $GITHUB_ENV
144-
echo "WINPYFLAVOR=$FLAVOR" >> $GITHUB_ENV
145-
echo "WINPYZIP=${{ matrix.flavor.ZIP }}" >> $GITHUB_ENV
146-
echo "WINPY7Z=${{ matrix.flavor.SEVEN_Z }}" >> $GITHUB_ENV
147-
echo "WINPYEXE=${{ matrix.flavor.EXE }}" >> $GITHUB_ENV
148-
echo "PANDOC=${{ matrix.flavor.PANDOC }}" >> $GITHUB_ENV
149-
echo "my_release_level=${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV
140+
echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ env.my_release_level }}" >> $GITHUB_ENV
150141
151142
# Centralized mapping of python binaries and SHAs by version and arch.
152143
# NOTE: fill the 3.15 URLs and SHA values when available.
@@ -163,47 +154,17 @@ jobs:
163154
fi
164155
165156
# 3.14 X64 (free-threading)
166-
# SHA not provided here: fill the correct SHA for security, otherwise the workflow will skip SHA check.
167157
if [ "$PYTHON_VERSION" = "3.14" ] && [ "$WINPYARCHDET" = "64F" ]; then
168158
echo "python_source=https://github.com/astral-sh/python-build-standalone/releases/download/20251205/cpython-3.14.2+20251205-x86_64-pc-windows-msvc-freethreaded+pgo-full.tar.zst" >> $GITHUB_ENV
169159
echo "python_sha256=536cf813857ea566fcfae18a1b7dbcd185385f1dc1f04d5a0951bad235c8fc61" >> $GITHUB_ENV
170160
fi
171161
172162
# 3.15 X64 (GIL)
173163
if [ "$PYTHON_VERSION" = "3.15" ] && [ "$WINPYARCHDET" = "64" ]; then
174-
# Example placeholders -- replace with real URLs and shas when available
175164
echo "python_source=https://github.com/astral-sh/python-build-standalone/releases/download/20251205/cpython-3.15.0a2+20251205-x86_64-pc-windows-msvc-install_only_stripped.tar.gz" >> $GITHUB_ENV
176165
echo "python_sha256=0ae8237881058aafb4bdf8ae9468e4791a5f3fd277a99bd90b7cb1175b96f0cb" >> $GITHUB_ENV
177166
fi
178167
179-
- name: See variables
180-
if: env.WINPYREQUIREMENTS != ''
181-
shell: pwsh
182-
run: |
183-
Write-Output "PYTHON_VERSION is $env:PYTHON_VERSION"
184-
Write-Output "WINPYFLAVOR is $env:WINPYFLAVOR"
185-
186-
Write-Output "WINPYREQUIREMENTS is $env:WINPYREQUIREMENTS"
187-
Write-Output "WINPYREQUIREMENTSwhl is $env:WINPYREQUIREMENTSwhl"
188-
Write-Output "ARTIFACT_NAME is $env:ARTIFACT_NAME"
189-
190-
Write-Output "python_source is $env:python_source"
191-
Write-Output "python_sha256 is $env:python_sha256"
192-
193-
Write-Output "WINPYVERSION is $env:WINPYVERSION"
194-
Write-Output "WINPYVER2 is $env:WINPYVER2"
195-
Write-Output "build_location is $env:build_location"
196-
197-
Write-Output "WINPYARCH is $env:WINPYARCH"
198-
Write-Output "WINPYARCHDET is $env:WINPYARCHDET"
199-
Write-Output "WINPYZIP is $env:WINPYZIP"
200-
Write-Output "WINPY7Z is $env:WINPY7Z"
201-
Write-Output "WINPYEXE is $env:WINPYEXE"
202-
Write-Output "PANDOC is $env:PANDOC"
203-
Write-Output "destwheelhouse is $env:destwheelhouse"
204-
205-
Write-Output "WINPYVER is $env:WINPYVER"
206-
207168
- name: Download python-3 standalone
208169
if: env.WINPYREQUIREMENTS != ''
209170
shell: pwsh

0 commit comments

Comments
 (0)