Skip to content

Commit e094d61

Browse files
authored
[3.12] gh-123418: Update CI to use fresh OpenSSL releases (GH-123698)
Also adds openssl/openssl GitHub URL template for newer OpenSSL downloads (cherry picked from commit 56b00f4)
1 parent c6ee0b3 commit e094d61

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ jobs:
255255
strategy:
256256
fail-fast: false
257257
matrix:
258-
openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
258+
openssl_ver: [1.1.1w, 3.0.15, 3.1.7, 3.2.3]
259259
env:
260260
OPENSSL_VER: ${{ matrix.openssl_ver }}
261261
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -311,7 +311,7 @@ jobs:
311311
needs: check_source
312312
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
313313
env:
314-
OPENSSL_VER: 3.0.13
314+
OPENSSL_VER: 3.0.15
315315
PYTHONSTRICTEXTENSIONBUILD: 1
316316
steps:
317317
- uses: actions/checkout@v4
@@ -424,7 +424,7 @@ jobs:
424424
needs: check_source
425425
if: needs.check_source.outputs.run_tests == 'true'
426426
env:
427-
OPENSSL_VER: 3.0.13
427+
OPENSSL_VER: 3.0.15
428428
PYTHONSTRICTEXTENSIONBUILD: 1
429429
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
430430
steps:

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
timeout-minutes: 60
1717
runs-on: ubuntu-22.04
1818
env:
19-
OPENSSL_VER: 3.0.13
19+
OPENSSL_VER: 3.0.15
2020
PYTHONSTRICTEXTENSIONBUILD: 1
2121
steps:
2222
- uses: actions/checkout@v4
Lines changed: 2 additions & 0 deletions
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

Lines changed: 5 additions & 3 deletions
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 = [
@@ -394,6 +394,7 @@ def run_python_tests(self, tests, network=True):
394394
class BuildOpenSSL(AbstractBuilder):
395395
library = "OpenSSL"
396396
url_templates = (
397+
"https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz",
397398
"https://www.openssl.org/source/openssl-{v}.tar.gz",
398399
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
399400
)
@@ -436,6 +437,7 @@ def short_version(self):
436437
parsed = parsed[:2]
437438
return ".".join(str(i) for i in parsed)
438439

440+
439441
class BuildLibreSSL(AbstractBuilder):
440442
library = "LibreSSL"
441443
url_templates = (

0 commit comments

Comments
 (0)