From cd94e7004036e0149d7d3fa236c7dd44cf460788 Mon Sep 17 00:00:00 2001 From: bashonly <88596187+bashonly@users.noreply.github.com> Date: Sat, 6 Sep 2025 00:41:43 -0500 Subject: [PATCH] [build] Post-release workflow cleanup (#14250) Authored by: bashonly --- .github/workflows/build.yml | 12 ++++++++---- bundle/docker/compose.yml | 8 +++++--- bundle/docker/linux/verify.sh | 6 +++++- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 510edb1e72..00cd946fee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,6 +135,7 @@ jobs: CHANNEL: ${{ inputs.channel }} ORIGIN: ${{ needs.process.outputs.origin }} VERSION: ${{ needs.process.outputs.version }} + UPDATE_TO: yt-dlp/yt-dlp@2025.09.05 steps: - uses: actions/checkout@v4 with: @@ -159,7 +160,7 @@ jobs: chmod +x ./yt-dlp cp ./yt-dlp ./yt-dlp_downgraded version="$(./yt-dlp --version)" - ./yt-dlp_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04 + ./yt-dlp_downgraded -v --update-to "${UPDATE_TO}" downgraded_version="$(./yt-dlp_downgraded --version)" [[ "${version}" != "${downgraded_version}" ]] - name: Upload artifacts @@ -190,6 +191,7 @@ jobs: ORIGIN: ${{ needs.process.outputs.origin }} VERSION: ${{ needs.process.outputs.version }} EXE_NAME: ${{ matrix.exe }} + UPDATE_TO: yt-dlp/yt-dlp@2025.09.05 steps: - uses: actions/checkout@v4 - name: Build executable @@ -215,7 +217,7 @@ jobs: mkdir -p ~/testing cp "./dist/${EXE_NAME}" ~/testing/"${EXE_NAME}_downgraded" version="$("./dist/${EXE_NAME}" --version)" - ~/testing/"${EXE_NAME}_downgraded" -v --update-to yt-dlp/yt-dlp@2023.03.04 + ~/testing/"${EXE_NAME}_downgraded" -v --update-to "${UPDATE_TO}" downgraded_version="$(~/testing/"${EXE_NAME}_downgraded" --version)" [[ "${version}" != "${downgraded_version}" ]] - name: Upload artifacts @@ -333,6 +335,7 @@ jobs: CHANNEL: ${{ inputs.channel }} ORIGIN: ${{ needs.process.outputs.origin }} VERSION: ${{ needs.process.outputs.version }} + UPDATE_TO: yt-dlp/yt-dlp@2025.09.05 steps: - uses: actions/checkout@v4 @@ -409,7 +412,7 @@ jobs: chmod +x ./dist/yt-dlp_macos cp ./dist/yt-dlp_macos ./dist/yt-dlp_macos_downgraded version="$(./dist/yt-dlp_macos --version)" - ./dist/yt-dlp_macos_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04 + ./dist/yt-dlp_macos_downgraded -v --update-to "${UPDATE_TO}" downgraded_version="$(./dist/yt-dlp_macos_downgraded --version)" [[ "$version" != "$downgraded_version" ]] @@ -449,6 +452,7 @@ jobs: ORIGIN: ${{ needs.process.outputs.origin }} VERSION: ${{ needs.process.outputs.version }} SUFFIX: ${{ matrix.suffix }} + UPDATE_TO: yt-dlp/yt-dlp@2025.09.05 BASE_CACHE_KEY: cache-reqs-${{ github.job }}_${{ matrix.arch }}-${{ matrix.python_version }} # Use custom PyInstaller built with https://github.com/yt-dlp/Pyinstaller-builds PYINSTALLER_URL: https://yt-dlp.github.io/Pyinstaller-Builds/${{ matrix.arch }}/pyinstaller-6.15.0-py3-none-any.whl @@ -510,7 +514,7 @@ jobs: $name = "yt-dlp${Env:SUFFIX}" Copy-Item "./dist/${name}.exe" "./dist/${name}_downgraded.exe" $version = & "./dist/${name}.exe" --version - & "./dist/${name}_downgraded.exe" -v --update-to yt-dlp/yt-dlp@2025.08.20 + & "./dist/${name}_downgraded.exe" -v --update-to "${Env:UPDATE_TO}" $downgraded_version = & "./dist/${name}_downgraded.exe" --version if ($version -eq $downgraded_version) { exit 1 diff --git a/bundle/docker/compose.yml b/bundle/docker/compose.yml index 1216aac5d7..77062f594a 100644 --- a/bundle/docker/compose.yml +++ b/bundle/docker/compose.yml @@ -26,6 +26,7 @@ services: VERIFYIMAGE: quay.io/pypa/manylinux2014_x86_64:latest environment: EXE_NAME: ${EXE_NAME:?} + UPDATE_TO: volumes: - ../../dist:/build @@ -55,7 +56,7 @@ services: VERIFYIMAGE: quay.io/pypa/manylinux2014_aarch64:latest environment: EXE_NAME: ${EXE_NAME:?} - SKIP_UPDATE_TO: "1" # TODO: remove when there is a glibc2.17 aarch64 release to --update-to + UPDATE_TO: volumes: - ../../dist:/build @@ -87,6 +88,7 @@ services: VERIFYIMAGE: arm32v7/debian:bullseye environment: EXE_NAME: ${EXE_NAME:?} + UPDATE_TO: TEST_ONEDIR_BUILD: "1" volumes: - ../../dist:/build @@ -117,7 +119,7 @@ services: VERIFYIMAGE: alpine:3.22 environment: EXE_NAME: ${EXE_NAME:?} - SKIP_UPDATE_TO: "1" # TODO: remove when there is a musllinux_aarch64 release to --update-to + UPDATE_TO: volumes: - ../../dist:/build @@ -148,6 +150,6 @@ services: VERIFYIMAGE: alpine:3.22 environment: EXE_NAME: ${EXE_NAME:?} - SKIP_UPDATE_TO: "1" # TODO: remove when there is a musllinux_aarch64 release to --update-to + UPDATE_TO: volumes: - ../../dist:/build diff --git a/bundle/docker/linux/verify.sh b/bundle/docker/linux/verify.sh index 94de5f3e27..062a576f9d 100755 --- a/bundle/docker/linux/verify.sh +++ b/bundle/docker/linux/verify.sh @@ -35,9 +35,13 @@ if [ -n "${SKIP_UPDATE_TO:-}" ] || [ -n "${TEST_ONEDIR_BUILD:-}" ]; then exit 0 fi +if [ -z "${UPDATE_TO:-}" ]; then + UPDATE_TO="yt-dlp/yt-dlp@2025.09.05" +fi + cp "./${EXE_NAME}" "./${EXE_NAME}_downgraded" version="$("./${EXE_NAME}" --version)" -"./${EXE_NAME}_downgraded" -v --update-to yt-dlp/yt-dlp@2023.03.04 +"./${EXE_NAME}_downgraded" -v --update-to "${UPDATE_TO}" downgraded_version="$("./${EXE_NAME}_downgraded" --version)" if [ "${version}" = "${downgraded_version}" ]; then exit 1