From 48b2c6f88f8e114dc6f3d4e515a92189a18d8d10 Mon Sep 17 00:00:00 2001 From: stonebig Date: Sun, 30 Nov 2025 18:06:49 +0100 Subject: [PATCH] further simplification and relocation fix --- .../github_workflows_build-2025_05.yml | 23 ++++++------------- .../pylock.64-3_14_0_2whlb4.toml | 0 .../pylock.64-3_14_0_2whlb4_wheels.toml | 0 .../requir.64-3_14_0_2whlb4.txt | 0 .../requir.64-3_14_0_2whlb4_wheels.txt | 0 5 files changed, 7 insertions(+), 16 deletions(-) rename {.github/workflows => winpython/portable/cycle_2025_05}/pylock.64-3_14_0_2whlb4.toml (100%) rename {.github/workflows => winpython/portable/cycle_2025_05}/pylock.64-3_14_0_2whlb4_wheels.toml (100%) rename {.github/workflows => winpython/portable/cycle_2025_05}/requir.64-3_14_0_2whlb4.txt (100%) rename {.github/workflows => winpython/portable/cycle_2025_05}/requir.64-3_14_0_2whlb4_wheels.txt (100%) diff --git a/.github/workflows/github_workflows_build-2025_05.yml b/.github/workflows/github_workflows_build-2025_05.yml index b62e36e0..f789ffe3 100644 --- a/.github/workflows/github_workflows_build-2025_05.yml +++ b/.github/workflows/github_workflows_build-2025_05.yml @@ -116,39 +116,30 @@ jobs: if [ "$PYTHON_VERSION" = "3.13" ]; then echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_313 }}" >> $GITHUB_ENV echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_313 }}" >> $GITHUB_ENV - echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV echo "WINPYVERSION=313" >> $GITHUB_ENV WINPYVER2="3.13.8.0" - echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV BUILD_LOCATION="WPy64-31380" - echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV - echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV - echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV elif [ "$PYTHON_VERSION" = "3.14" ]; then echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_314 }}" >> $GITHUB_ENV echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_314 }}" >> $GITHUB_ENV - echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV echo "WINPYVERSION=314" >> $GITHUB_ENV WINPYVER2="3.14.0.2" - echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV BUILD_LOCATION="WPy64-31380" - echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV - echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV - echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV elif [ "$PYTHON_VERSION" = "3.15" ]; then echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_315 }}" >> $GITHUB_ENV echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_315 }}" >> $GITHUB_ENV - echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV echo "WINPYVERSION=315" >> $GITHUB_ENV WINPYVER2="3.15.0.0" - echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV BUILD_LOCATION="WPy64-31500" - echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV - echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV - echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV - fi + fi # write common flavor env vars + echo "WINPYVER2=$WINPYVER2" >> $GITHUB_ENV + echo "ARTIFACT_NAME=publish_${PYTHON_VERSION}${FLAVOR}" >> $GITHUB_ENV + echo "build_location=$BUILD_LOCATION" >> $GITHUB_ENV + echo "destwheelhouse=${BUILD_LOCATION}\\wheelhouse\\included.wheels" >> $GITHUB_ENV + echo "WINPYVER=${WINPYVER2}${{ matrix.flavor.name }}${{ matrix.flavor.my_release_level }}" >> $GITHUB_ENV + echo "WINPYARCH=$WINPYARCH" >> $GITHUB_ENV echo "WINPYARCHDET=$WINPYARCHDET" >> $GITHUB_ENV echo "WINPYFLAVOR=$FLAVOR" >> $GITHUB_ENV diff --git a/.github/workflows/pylock.64-3_14_0_2whlb4.toml b/winpython/portable/cycle_2025_05/pylock.64-3_14_0_2whlb4.toml similarity index 100% rename from .github/workflows/pylock.64-3_14_0_2whlb4.toml rename to winpython/portable/cycle_2025_05/pylock.64-3_14_0_2whlb4.toml diff --git a/.github/workflows/pylock.64-3_14_0_2whlb4_wheels.toml b/winpython/portable/cycle_2025_05/pylock.64-3_14_0_2whlb4_wheels.toml similarity index 100% rename from .github/workflows/pylock.64-3_14_0_2whlb4_wheels.toml rename to winpython/portable/cycle_2025_05/pylock.64-3_14_0_2whlb4_wheels.toml diff --git a/.github/workflows/requir.64-3_14_0_2whlb4.txt b/winpython/portable/cycle_2025_05/requir.64-3_14_0_2whlb4.txt similarity index 100% rename from .github/workflows/requir.64-3_14_0_2whlb4.txt rename to winpython/portable/cycle_2025_05/requir.64-3_14_0_2whlb4.txt diff --git a/.github/workflows/requir.64-3_14_0_2whlb4_wheels.txt b/winpython/portable/cycle_2025_05/requir.64-3_14_0_2whlb4_wheels.txt similarity index 100% rename from .github/workflows/requir.64-3_14_0_2whlb4_wheels.txt rename to winpython/portable/cycle_2025_05/requir.64-3_14_0_2whlb4_wheels.txt