Skip to content

Commit e84015f

Browse files
authored
[3.11] pythongh-123418: Update CI to use fresh OpenSSL releases (pythonGH-123675) (python#123699)
* [3.11] pythongh-123418: Update CI to use fresh OpenSSL releases (pythonGH-123675) Also adds openssl/openssl GitHub URL template for newer OpenSSL downloads (cherry picked from commit 56b00f4) Co-authored-by: Zachary Ware <[email protected]> * Adjust build_ubuntu_ssltests job to use cache for the correct OS version
1 parent affa2a9 commit e84015f

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ jobs:
235235
fail-fast: false
236236
matrix:
237237
os: [ubuntu-20.04]
238-
openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
238+
openssl_ver: [1.1.1w, 3.0.15, 3.1.7, 3.2.3]
239239
env:
240240
OPENSSL_VER: ${{ matrix.openssl_ver }}
241241
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -291,7 +291,7 @@ jobs:
291291
needs: check_source
292292
if: needs.check_source.outputs.run_tests == 'true'
293293
env:
294-
OPENSSL_VER: 3.0.13
294+
OPENSSL_VER: 3.0.15
295295
PYTHONSTRICTEXTENSIONBUILD: 1
296296
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
297297
steps:

.github/workflows/reusable-ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
os: [ubuntu-20.04]
2020
env:
21-
OPENSSL_VER: 3.0.13
21+
OPENSSL_VER: 3.0.15
2222
PYTHONSTRICTEXTENSIONBUILD: 1
2323
steps:
2424
- uses: actions/checkout@v4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Update GitHub CI workflows to use OpenSSL 3.0.15 and multissltests to use
2+
3.0.15, 3.1.7, and 3.2.3.

Tools/ssl/multissltests.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848

4949
OPENSSL_RECENT_VERSIONS = [
5050
"1.1.1w",
51-
"3.0.13",
52-
"3.1.5",
53-
"3.2.1",
51+
"3.0.15",
52+
"3.1.7",
53+
"3.2.3",
5454
]
5555

5656
LIBRESSL_OLD_VERSIONS = [
@@ -395,6 +395,7 @@ def run_python_tests(self, tests, network=True):
395395
class BuildOpenSSL(AbstractBuilder):
396396
library = "OpenSSL"
397397
url_templates = (
398+
"https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz",
398399
"https://www.openssl.org/source/openssl-{v}.tar.gz",
399400
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
400401
)
@@ -437,6 +438,7 @@ def short_version(self):
437438
parsed = parsed[:2]
438439
return ".".join(str(i) for i in parsed)
439440

441+
440442
class BuildLibreSSL(AbstractBuilder):
441443
library = "LibreSSL"
442444
url_templates = (

0 commit comments

Comments
 (0)