https://github.com/python/cpython/commit/e84015f84630b6e15a84680128a6f65f8c4daf92 commit: e84015f84630b6e15a84680128a6f65f8c4daf92 branch: 3.11 author: Zachary Ware <[email protected]> committer: pablogsal <[email protected]> date: 2024-10-22T15:48:51Z summary:
[3.11] gh-123418: Update CI to use fresh OpenSSL releases (GH-123675) (#123699) * [3.11] gh-123418: Update CI to use fresh OpenSSL releases (GH-123675) Also adds openssl/openssl GitHub URL template for newer OpenSSL downloads (cherry picked from commit 56b00f4705634af2861a8aa9c2eb5769012220f0) Co-authored-by: Zachary Ware <[email protected]> * Adjust build_ubuntu_ssltests job to use cache for the correct OS version 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 f8f4e69fc3eb04..fd809714fa951a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -235,7 +235,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04] - 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 @@ -291,7 +291,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 6beafb4c3fca2d..70478d400ccb5e 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-20.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 99ecc45a637d2f..b59c98f401a9b3 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -48,9 +48,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 = [ @@ -395,6 +395,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"; ) @@ -437,6 +438,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]
