https://github.com/python/cpython/commit/e094d61a155a4a3f380d07391f47cfd0886559b1
commit: e094d61a155a4a3f380d07391f47cfd0886559b1
branch: 3.12
author: Zachary Ware <[email protected]>
committer: zware <[email protected]>
date: 2024-09-04T14:37:09-05:00
summary:
[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 56b00f4705634af2861a8aa9c2eb5769012220f0)
files:
A Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst
M .github/workflows/build.yml
M .github/workflows/reusable-ubuntu.yml
M Tools/ssl/multissltests.py
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b10d3beaf53a67..4ec61918613938 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -255,7 +255,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
+ openssl_ver: [1.1.1w, 3.0.15, 3.1.7, 3.2.3]
env:
OPENSSL_VER: ${{ matrix.openssl_ver }}
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -311,7 +311,7 @@ jobs:
needs: check_source
if: needs.check_source.outputs.run_tests == 'true' &&
needs.check_source.outputs.run_hypothesis == 'true'
env:
- OPENSSL_VER: 3.0.13
+ OPENSSL_VER: 3.0.15
PYTHONSTRICTEXTENSIONBUILD: 1
steps:
- uses: actions/checkout@v4
@@ -424,7 +424,7 @@ jobs:
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
env:
- OPENSSL_VER: 3.0.13
+ OPENSSL_VER: 3.0.15
PYTHONSTRICTEXTENSIONBUILD: 1
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
steps:
diff --git a/.github/workflows/reusable-ubuntu.yml
b/.github/workflows/reusable-ubuntu.yml
index dd47a380da1e77..d27653925342ed 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -16,7 +16,7 @@ jobs:
timeout-minutes: 60
runs-on: ubuntu-22.04
env:
- OPENSSL_VER: 3.0.13
+ OPENSSL_VER: 3.0.15
PYTHONSTRICTEXTENSIONBUILD: 1
steps:
- uses: actions/checkout@v4
diff --git
a/Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst
b/Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst
new file mode 100644
index 00000000000000..fb9ac9e4f96725
--- /dev/null
+++
b/Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst
@@ -0,0 +1,2 @@
+Update GitHub CI workflows to use OpenSSL 3.0.15 and multissltests to use
+3.0.15, 3.1.7, and 3.2.3.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index efc4b243f6456c..1d5a64a84883b9 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -47,9 +47,9 @@
OPENSSL_RECENT_VERSIONS = [
"1.1.1w",
- "3.0.13",
- "3.1.5",
- "3.2.1",
+ "3.0.15",
+ "3.1.7",
+ "3.2.3",
]
LIBRESSL_OLD_VERSIONS = [
@@ -394,6 +394,7 @@ def run_python_tests(self, tests, network=True):
class BuildOpenSSL(AbstractBuilder):
library = "OpenSSL"
url_templates = (
+
"https://github.com/openssl/openssl/releases/download/openssl-{v}/openssl-{v}.tar.gz";,
"https://www.openssl.org/source/openssl-{v}.tar.gz";,
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz";
)
@@ -436,6 +437,7 @@ def short_version(self):
parsed = parsed[:2]
return ".".join(str(i) for i in parsed)
+
class BuildLibreSSL(AbstractBuilder):
library = "LibreSSL"
url_templates = (
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
