From c4e9412cbcd0dee0523ed653d8670ccc122d9bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 27 Sep 2026 07:53:32 -0400 Subject: [PATCH] Revert "CI: Workaround OSGeo4W OpenSSL DLL conflict by forcing one (#7959)" This reverts commit d6d2eb2845444abbabc309f543fc534ff2dc4fd8. --- .github/workflows/osgeo4w.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index e37116225aa..96b5a6bb9aa 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -98,20 +98,6 @@ jobs: sqlite3-devel zstd-devel - # Python in OSGeo4W bundles OpenSSL 3.0 DLLs with the same names as the - # OSGeo4W OpenSSL 3.5 DLLs. Once a process imports ssl, libcurl loaded - # later (by GDAL or PROJ) binds to the older libssl, but curl 8.22 needs - # SSL_get0_group_name from OpenSSL 3.2, so loading GDAL or GRASS - # libraries fails. OpenSSL 3 keeps its ABI across minor versions, so - # Python can use the newer DLLs. - - name: Use OSGeo4W OpenSSL DLLs in Python - run: | - Copy-Item -Path "$env:O4WROOT\bin\libssl-3-x64.dll", "$env:O4WROOT\bin\libcrypto-3-x64.dll" ` - -Destination "$env:O4WROOT\apps\Python312\DLLs" -Force - shell: pwsh - env: - O4WROOT: ${{ steps.osgeo4w.outputs.root }} - - name: Set number of cores for compilation run: | echo "MAKEFLAGS=-j$(nproc)" >> "${GITHUB_ENV}"