]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-123418: Update CI to use fresh OpenSSL releases (GH-123698)
authorZachary Ware <zach@python.org>
Wed, 4 Sep 2024 19:37:09 +0000 (14:37 -0500)
committerGitHub <noreply@github.com>
Wed, 4 Sep 2024 19:37:09 +0000 (14:37 -0500)
Also adds openssl/openssl GitHub URL template for newer OpenSSL downloads
(cherry picked from commit 56b00f4705634af2861a8aa9c2eb5769012220f0)

.github/workflows/build.yml
.github/workflows/reusable-ubuntu.yml
Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst [new file with mode: 0644]
Tools/ssl/multissltests.py

index b10d3beaf53a671c191304155bbd1946fc8df14f..4ec619186139382932f40a51909c9e1b7f613892 100644 (file)
@@ -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:
index dd47a380da1e77e32ca0d559689a049bc19f0910..d27653925342ed1dfc5eb95bc12092ed013e194f 100644 (file)
@@ -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 (file)
index 0000000..fb9ac9e
--- /dev/null
@@ -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.
index efc4b243f6456c1612cb0e73ec4178119d91a852..1d5a64a84883b991bedebea958df81a67907e575 100755 (executable)
@@ -47,9 +47,9 @@ OPENSSL_OLD_VERSIONS = [
 
 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 @@ class AbstractBuilder(object):
 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 @@ class BuildOpenSSL(AbstractBuilder):
             parsed = parsed[:2]
         return ".".join(str(i) for i in parsed)
 
+
 class BuildLibreSSL(AbstractBuilder):
     library = "LibreSSL"
     url_templates = (