diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-02-06 02:29:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-06 02:29:17 (GMT) |
| commit | 5ddb2740404ad62e74ecb0ea97ed98651821ed3f (patch) | |
| tree | b61ed54ae91fdc06ac420981f614678d996981f4 | |
| parent | 51f8c0459d48966daa4e1676187f6943c6446aff (diff) | |
| download | cpython-5ddb2740404ad62e74ecb0ea97ed98651821ed3f.zip cpython-5ddb2740404ad62e74ecb0ea97ed98651821ed3f.tar.gz cpython-5ddb2740404ad62e74ecb0ea97ed98651821ed3f.tar.bz2 | |
[3.12] gh-109991: Update GitHub CI workflows to use OpenSSL 3.0.13. (GH-115055)
Also update multissltests to use 1.1.1w, 3.0.13, 3.1.5, and 3.2.1.
(cherry picked from commit 299e16ca0f303a1e00bd0e04679862a5d4db5ab2)
Co-authored-by: Ned Deily <nad@python.org>
| -rw-r--r-- | .github/workflows/build.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/reusable-ubuntu.yml | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tools-Demos/2024-02-05-19-00-32.gh-issue-109991.yJSEkw.rst | 2 | ||||
| -rwxr-xr-x | Tools/ssl/multissltests.py | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6530a90..8f82c80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -249,7 +249,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 @@ -303,7 +303,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.11 + OPENSSL_VER: 3.0.13 PYTHONSTRICTEXTENSIONBUILD: 1 steps: - uses: actions/checkout@v4 @@ -414,7 +414,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 f066fb5..efc4b24 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -47,8 +47,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 = [ |