Merge pull request #1959 from stonebig/master

stonebig · web-flow · commit 0c0bf70d6cc6 · 2026-01-04T18:52:52.000+01:00
fix
diff --git a/.github/workflows/github_workflows_build-2026_01.yml b/.github/workflows/github_workflows_build-2026_01.yml
@@ -129,6 +129,7 @@ jobs:
           WINPYARCHDET: ${{ env.WINPYARCHDET }}
           WINPYVER2: ${{ steps.python_config.outputs.ver2 }}
           my_cycle: ${{ env.my_cycle }}
+          my_release_level: ${{ env.my_release_level }}
           V_TAG: ${{ steps.python_config.outputs.v_tag }}
           FLAVOR_NAME: ${{ matrix.flavor.name }}
         run: |
@@ -146,8 +147,18 @@ jobs:
           BUILD_LOCATION="WPy64-${WINPYVER2//./}"
           echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV
 
+          WINPYREQUIREMENTS = "$my_cycle/requir.64-$vtag" + "$FLAVOR_NAME" + "$my_release_level" + ".txt"
+          WINPYREQUIREMENTSwhl = "$my_cycle/requir.64-$vtag" + "$FLAVOR_NAME"  + "_wheels" + "$my_release_level" + ".txt"
+          echo "searching  $WINPYREQUIREMENTS $WINPYREQUIREMENTSwhl"
+          if [[ -f "$WINPYREQUIREMENTS" ]]; then
+            echo "WINPYREQUIREMENTS=$WINPYREQUIREMENTS">> $GITHUB_ENV
+            echo "Found $WINPYREQUIREMENTS"
+            if [[ -f "$WINPYREQUIREMENTSwhl" ]]; then
+              echo "WINPYREQUIREMENTSwhl=$WINPYREQUIREMENTSwhl">> $GITHUB_ENV
+              echo "Found also $WINPYREQUIREMENTSwhl"
+          #fi
           # Populate generic per-flavor / per-version selections using matrix-expanded values
-          if [ "$PYTHON_VERSION" = "3.13" ]; then
+          elif [ "$PYTHON_VERSION" = "3.13" ]; then
             echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_313 }}" >> $GITHUB_ENV
             echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_313 }}" >> $GITHUB_ENV
           elif [ "$PYTHON_VERSION" = "3.14" ] && [ "$WINPYARCHDET" = "$detected_arch" ]; then
@@ -156,11 +167,6 @@ jobs:
           elif [ "$PYTHON_VERSION" = "3.15" ]; then
             echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_315 }}" >> $GITHUB_ENV
             echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_315 }}" >> $GITHUB_ENV
-            test="$my_cycle/requir.64-${v_tag}${FLAVOR_NAME}.txt"
-            echo "WINPYREQUIREMENTS=$test"
-            if [[ -f "$test" ]]; then
-               echo "Found $test"
-            fi   
           fi
 
           # write common flavor env vars derived here rather than in the job env block
