Skip to content

[3.13] gh-123418: Update CI to use fresh OpenSSL releases (GH-123675) #123696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zware merged 1 commit into from
Sep 4, 2024
Merged

[3.13] gh-123418: Update CI to use fresh OpenSSL releases (GH-123675) #123696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 56b00f4)

Co-authored-by: Zachary Ware <zach@python.org>
  • Loading branch information
@zware @miss-islington
zware authored and miss-islington committed Sep 4, 2024
commit 6f2ccdc14890d5c6b00336967d5a4ef31526419d
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,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
Expand Down Expand Up @@ -309,7 +309,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
Expand Down Expand Up @@ -422,7 +422,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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-22.04
env:
FORCE_COLOR: 1
OPENSSL_VER: 3.0.13
OPENSSL_VER: 3.0.15
PYTHONSTRICTEXTENSIONBUILD: 1
TERM: linux
steps:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tools-Demos/2024-09-04-10-07-51.gh-issue-123418.1eIFZb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 5 additions & 3 deletions Tools/ssl/multissltests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -397,6 +397,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"
)
Expand Down Expand Up @@ -439,6 +440,7 @@ def short_version(self):
parsed = parsed[:2]
return ".".join(str(i) for i in parsed)


class BuildLibreSSL(AbstractBuilder):
library = "LibreSSL"
url_templates = (
Expand Down