@@ -31,52 +31,22 @@ jobs:
3131 matrix :
3232 flavor :
3333 - name : " dot"
34- REQUIREMENTS_313 : " requir.64-3_13_11_1dotb0.txt"
35- REQUIREMENTS_314 : " requir.64-3_14_2_1dotb0.txt"
36- REQUIREMENTS_315 : " requir.64-3_15_0_1dotb0.txt"
37- REQUIREMENTS_WHL_313 : " "
38- REQUIREMENTS_WHL_314 : " "
39- REQUIREMENTS_WHL_315 : " "
4034 formats : { zip: true, 7z: false, exe: true }
4135 PANDOC : " 0"
4236 WINPYARCHDET : " 64"
4337 - name : " slim"
44- REQUIREMENTS_313 : " requir.64-3_13_11_1slimb0.txt"
45- REQUIREMENTS_314 : " requir.64-3_14_2_1slimb0.txt"
46- REQUIREMENTS_315 : " "
47- REQUIREMENTS_WHL_313 : " "
48- REQUIREMENTS_WHL_314 : " "
49- REQUIREMENTS_WHL_315 : " "
5038 formats : { zip: false, 7z: true, exe: true }
5139 PANDOC : " 1"
5240 WINPYARCHDET : " 64"
5341 - name : " whl"
54- REQUIREMENTS_313 : " requir.64-3_13_11_1dotb0.txt"
55- REQUIREMENTS_314 : " requir.64-3_14_2_1dotb0.txt"
56- REQUIREMENTS_315 : " "
57- REQUIREMENTS_WHL_313 : " requir.64-3_13_11_1whl_wheelsb0.txt"
58- REQUIREMENTS_WHL_314 : " requir.64-3_14_2_1whl_wheelsb0.txt"
59- REQUIREMENTS_WHL_315 : " "
6042 formats : { zip: false, 7z: true, exe: false }
6143 PANDOC : " 0"
6244 WINPYARCHDET : " 64"
6345 - name : " free"
64- REQUIREMENTS_313 : " "
65- REQUIREMENTS_314 : " requir.64-3_14_2_1freeb0.txt"
66- REQUIREMENTS_315 : " "
67- REQUIREMENTS_WHL_313 : " "
68- REQUIREMENTS_WHL_314 : " "
69- REQUIREMENTS_WHL_315 : " "
7046 formats : { zip: true, 7z: false, exe: true }
7147 PANDOC : " 0"
7248 WINPYARCHDET : " 64F"
7349 - name : " slimf"
74- REQUIREMENTS_313 : " "
75- REQUIREMENTS_314 : " requir.64-3_14_2_1slimfb0.txt"
76- REQUIREMENTS_315 : " "
77- REQUIREMENTS_WHL_313 : " "
78- REQUIREMENTS_WHL_314 : " "
79- REQUIREMENTS_WHL_315 : " "
8050 formats : { zip: false, 7z: true, exe: true }
8151 PANDOC : " 1"
8252 WINPYARCHDET : " 64F"
@@ -151,7 +121,7 @@ jobs:
151121 WINPYREQUIREMENTSwhl=""
152122 testreq="${my_cycle}/requir.64-${V_TAG}${FLAVOR_NAME}${my_release_level}.txt"
153123 testwhl="${my_cycle}/requir.64-${V_TAG}${FLAVOR_NAME}_wheels${my_release_level}.txt"
154- echo "is $WINPYARCHDET=$detected_arch , search $testreq $testwhl $detected_arch"
124+ echo "if $WINPYARCHDET=$detected_arch , search $testreq $testwhl $detected_arch"
155125 if [ "$WINPYARCHDET" = "$detected_arch" ] && [[ -f "$testreq" ]] ; then
156126 WINPYREQUIREMENTS="$testreq"
157127 echo "Found $WINPYREQUIREMENTS"
@@ -162,17 +132,6 @@ jobs:
162132 fi
163133 echo "WINPYREQUIREMENTS=$WINPYREQUIREMENTS" >> $GITHUB_ENV
164134 echo "WINPYREQUIREMENTSwhl=$WINPYREQUIREMENTSwhl" >> $GITHUB_ENV
165- # Populate generic per-flavor / per-version selections using matrix-expanded values
166- #elif [ "$PYTHON_VERSION" = "3.13" ]; then
167- # echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_313 }}" >> $GITHUB_ENV
168- # echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_313 }}" >> $GITHUB_ENV
169- #elif [ "$PYTHON_VERSION" = "3.14" ] && [ "$WINPYARCHDET" = "$detected_arch" ]; then
170- # echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_314 }}" >> $GITHUB_ENV
171- # echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_314 }}" >> $GITHUB_ENV
172- #elif [ "$PYTHON_VERSION" = "3.15" ]; then
173- # echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_315 }}" >> $GITHUB_ENV
174- # echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_315 }}" >> $GITHUB_ENV
175- #fi
176135
177136 # write common flavor env vars derived here rather than in the job env block
178137 ARTIFACT_NAME="publish_${PYTHON_VERSION}${FLAVOR_NAME}"
0 commit comments