From e2c747bb5d4091a1584fcbc8e5255607fa29d145 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 26 Aug 2025 11:42:21 +0200 Subject: [PATCH] GHA/curl-for-win: drop x86, fix zlib-classic, switch back to libssh - switch x86 job to x64. x86 is not longer actively maintained in curl-for-win. Ref: https://github.com/curl/curl-for-win/discussions/68 - switch back from libssh2 to libssh. Reverts af8e1aa4b06e9dc78a559b485348e5464bd5cff5 #18257 - fix to really build with zlib-classic. Follow-up to 80768248700ae1e33fdedffd2e8bd78167b793aa #17357 Closes #18400 --- .github/workflows/curl-for-win.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/curl-for-win.yml b/.github/workflows/curl-for-win.yml index c9d10c636d..704a78d2cd 100644 --- a/.github/workflows/curl-for-win.yml +++ b/.github/workflows/curl-for-win.yml @@ -147,8 +147,8 @@ jobs: "${DOCKER_IMAGE}" \ sh -c ./_ci-linux-debian.sh - win-gcc-zlibold-x86: - name: 'Windows gcc zlib-classic (x86)' + win-gcc-libssh-zlibold-x64: + name: 'Windows gcc libssh zlib-classic (x64)' runs-on: ubuntu-latest timeout-minutes: 10 steps: @@ -161,7 +161,7 @@ jobs: run: | git clone --depth 1 https://github.com/curl/curl-for-win mv curl-for-win/* . - export CW_CONFIG='-main-werror-unitybatch-win-x86-gcc-zlibng' + export CW_CONFIG='-main-werror-unitybatch-win-x64-gcc-libssh1-zlibold' export CW_REVISION="${GITHUB_SHA}" . ./_versions.sh sudo podman image trust set --type reject default -- 2.47.3