]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-144551: Update various CI jobs to OpenSSL 3.5 (GH-144808)
authorZachary Ware <zach@python.org>
Fri, 13 Feb 2026 23:02:11 +0000 (17:02 -0600)
committerGitHub <noreply@github.com>
Fri, 13 Feb 2026 23:02:11 +0000 (23:02 +0000)
Also includes a fix to the address sanitizer build to build the `_ssl`
module against the expected OpenSSL build.

.github/workflows/build.yml
.github/workflows/reusable-macos.yml
.github/workflows/reusable-ubuntu.yml

index f9a6fb61272e441fd8a1ed6cf6ae5fe339e35194..f302cb049326b0071c343116caf1cf435abdc6f4 100644 (file)
@@ -428,7 +428,7 @@ jobs:
     needs: build-context
     if: needs.build-context.outputs.run-ubuntu == 'true'
     env:
-      OPENSSL_VER: 3.0.18
+      OPENSSL_VER: 3.5.5
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout@v6
@@ -539,7 +539,7 @@ jobs:
       matrix:
         os: [ubuntu-24.04]
     env:
-      OPENSSL_VER: 3.0.18
+      OPENSSL_VER: 3.5.5
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps:
@@ -574,7 +574,7 @@ jobs:
       run: |
         echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
     - name: Configure CPython
-      run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
+      run: ./configure --config-cache --with-address-sanitizer --without-pymalloc --with-openssl="$OPENSSL_DIR"
     - name: Build CPython
       run: make -j4
     - name: Display build info
index 7eef66bd9d93241ee804a226d1fe10a35d31dbfa..6afbf6595d93e3e0ea0a32d9313c511732eef195 100644 (file)
@@ -35,7 +35,7 @@ jobs:
       run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
     - name: Install Homebrew dependencies
       run: |
-        brew install pkg-config openssl@3.0 xz gdbm tcl-tk@9 make
+        brew install pkg-config openssl@3.5 xz gdbm tcl-tk@9 make
         # Because alternate versions are not symlinked into place by default:
         brew link --overwrite tcl-tk@9
     - name: Configure CPython
@@ -50,7 +50,7 @@ jobs:
           --enable-safety \
           ${{ inputs.free-threading && '--disable-gil' || '' }} \
           --prefix=/opt/python-dev \
-          --with-openssl="$(brew --prefix openssl@3.0)"
+          --with-openssl="$(brew --prefix openssl@3.5)"
     - name: Build CPython
       if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
       run: gmake -j8
index ad725e92f2b20fe96a09565bc88a37b4a1e24517..03f41069b8430d8a41dcd43bf8b8c2ba97e97894 100644 (file)
@@ -27,7 +27,7 @@ jobs:
     runs-on: ${{ inputs.os }}
     timeout-minutes: 60
     env:
-      OPENSSL_VER: 3.0.18
+      OPENSSL_VER: 3.5.5
       PYTHONSTRICTEXTENSIONBUILD: 1
       TERM: linux
     steps: