Skip to content

Commit 48b2c6f

Browse files
stonebigstonebig
committed
further simplification and relocation fix
1 parent 0ddbdb9 commit 48b2c6f

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,39 +116,30 @@ jobs:
116116
if [ "$PYTHON_VERSION" = "3.13" ]; then
117117
echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_313 }}" >> $GITHUB_ENV
118118
echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_313 }}" >> $GITHUB_ENV
119-
echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV
120119
echo "WINPYVERSION=313" >> $GITHUB_ENV
121120
WINPYVER2="3.13.8.0"
122-
echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV
123121
BUILD_LOCATION="WPy64-31380"
124-
echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV
125-
echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV
126-
echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV
127122
elif [ "$PYTHON_VERSION" = "3.14" ]; then
128123
echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_314 }}" >> $GITHUB_ENV
129124
echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_314 }}" >> $GITHUB_ENV
130-
echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV
131125
echo "WINPYVERSION=314" >> $GITHUB_ENV
132126
WINPYVER2="3.14.0.2"
133-
echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV
134127
BUILD_LOCATION="WPy64-31380"
135-
echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV
136-
echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV
137-
echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV
138128
elif [ "$PYTHON_VERSION" = "3.15" ]; then
139129
echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_315 }}" >> $GITHUB_ENV
140130
echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_315 }}" >> $GITHUB_ENV
141-
echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV
142131
echo "WINPYVERSION=315" >> $GITHUB_ENV
143132
WINPYVER2="3.15.0.0"
144-
echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV
145133
BUILD_LOCATION="WPy64-31500"
146-
echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV
147-
echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV
148-
echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV
149-
fi
134+
fi
150135
151136
# write common flavor env vars
137+
echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV
138+
echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV
139+
echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV
140+
echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV
141+
echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV
142+
152143
echo "WINPYARCH=$WINPYARCH" >> $GITHUB_ENV
153144
echo "WINPYARCHDET=$WINPYARCHDET" >> $GITHUB_ENV
154145
echo "WINPYFLAVOR=$FLAVOR" >> $GITHUB_ENV

.github/workflows/pylock.64-3_14_0_2whlb4.toml renamed to winpython/portable/cycle_2025_05/pylock.64-3_14_0_2whlb4.toml

File renamed without changes.

.github/workflows/pylock.64-3_14_0_2whlb4_wheels.toml renamed to winpython/portable/cycle_2025_05/pylock.64-3_14_0_2whlb4_wheels.toml

File renamed without changes.

.github/workflows/requir.64-3_14_0_2whlb4.txt renamed to winpython/portable/cycle_2025_05/requir.64-3_14_0_2whlb4.txt

File renamed without changes.

.github/workflows/requir.64-3_14_0_2whlb4_wheels.txt renamed to winpython/portable/cycle_2025_05/requir.64-3_14_0_2whlb4_wheels.txt

File renamed without changes.

0 commit comments

Comments
 (0)