summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2024-02-06 04:02:10 (GMT)
committerGitHub <noreply@github.com>2024-02-06 04:02:10 (GMT)
commit319e69579eaa73b1c106dacb44cb2148e9aa9e21 (patch)
treea4cde242c7d970dc6926038918902f3653f34746
parent753d0d559caeec389b348a397a7e6a83a3460890 (diff)
downloadcpython-319e69579eaa73b1c106dacb44cb2148e9aa9e21.zip
cpython-319e69579eaa73b1c106dacb44cb2148e9aa9e21.tar.gz
cpython-319e69579eaa73b1c106dacb44cb2148e9aa9e21.tar.bz2
[3.11] gh-109991: Update GitHub CI workflows to use OpenSSL 3.0.13. (GH-115057)
Also update multissltests to use 1.1.1w, 3.0.13, 3.1.5, and 3.2.1.
-rw-r--r--.github/workflows/build.yml4
-rw-r--r--.github/workflows/reusable-ubuntu.yml2
-rw-r--r--Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst2
-rwxr-xr-xTools/ssl/multissltests.py5
4 files changed, 8 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 080eeee..6143248 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -232,7 +232,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- openssl_ver: [1.1.1w, 3.0.11, 3.1.3]
+ openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
env:
OPENSSL_VER: ${{ matrix.openssl_ver }}
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -286,7 +286,7 @@ jobs:
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
env:
- OPENSSL_VER: 3.0.11
+ OPENSSL_VER: 3.0.13
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 db4ca4d..de413b8 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -14,7 +14,7 @@ jobs:
timeout-minutes: 60
runs-on: ubuntu-20.04
env:
- OPENSSL_VER: 3.0.11
+ OPENSSL_VER: 3.0.13
PYTHONSTRICTEXTENSIONBUILD: 1
steps:
- uses: actions/checkout@v4
diff --git a/Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst b/Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst
new file mode 100644
index 0000000..4eb4d39
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst
@@ -0,0 +1,2 @@
+Update GitHub CI workflows to use OpenSSL 3.0.13 and multissltests to use
+1.1.1w, 3.0.13, 3.1.5, and 3.2.1.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 7b9983f..99ecc45 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -48,8 +48,9 @@ OPENSSL_OLD_VERSIONS = [
OPENSSL_RECENT_VERSIONS = [
"1.1.1w",
- "3.0.11",
- "3.1.3",
+ "3.0.13",
+ "3.1.5",
+ "3.2.1",
]
LIBRESSL_OLD_VERSIONS = [