Skip to content

Commit 6f2ccdc

Browse files
zwaremiss-islington
authored andcommitted
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]>
1 parent 9193d29 commit 6f2ccdc

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ jobs:
245245
strategy:
246246
fail-fast: false
247247
matrix:
248-
openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
248+
openssl_ver: [1.1.1w, 3.0.15, 3.1.7, 3.2.3]
249249
env:
250250
OPENSSL_VER: ${{ matrix.openssl_ver }}
251251
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -309,7 +309,7 @@ jobs:
309309
needs: check_source
310310
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
311311
env:
312-
OPENSSL_VER: 3.0.13
312+
OPENSSL_VER: 3.0.15
313313
PYTHONSTRICTEXTENSIONBUILD: 1
314314
steps:
315315
- uses: actions/checkout@v4
@@ -422,7 +422,7 @@ jobs:
422422
needs: check_source
423423
if: needs.check_source.outputs.run_tests == 'true'
424424
env:
425-
OPENSSL_VER: 3.0.13
425+
OPENSSL_VER: 3.0.15
426426
PYTHONSTRICTEXTENSIONBUILD: 1
427427
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
428428
steps:

.github/workflows/reusable-ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
env:
1919
FORCE_COLOR: 1
20-
OPENSSL_VER: 3.0.13
20+
OPENSSL_VER: 3.0.15
2121
PYTHONSTRICTEXTENSIONBUILD: 1
2222
TERM: linux
2323
steps:
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
@@ -47,9 +47,9 @@
4747

4848
OPENSSL_RECENT_VERSIONS = [
4949
"1.1.1w",
50-
"3.0.13",
51-
"3.1.5",
52-
"3.2.1",
50+
"3.0.15",
51+
"3.1.7",
52+
"3.2.3",
5353
]
5454

5555
LIBRESSL_OLD_VERSIONS = [
@@ -397,6 +397,7 @@ def run_python_tests(self, tests, network=True):
397397
class BuildOpenSSL(AbstractBuilder):
398398
library = "OpenSSL"
399399
url_templates = (
400+
"https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz",
400401
"https://www.openssl.org/source/openssl-{v}.tar.gz",
401402
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
402403
)
@@ -439,6 +440,7 @@ def short_version(self):
439440
parsed = parsed[:2]
440441
return ".".join(str(i) for i in parsed)
441442

443+
442444
class BuildLibreSSL(AbstractBuilder):
443445
library = "LibreSSL"
444446
url_templates = (

0 commit comments

Comments
 (0)