Skip to content

gh-136728: Combine OpenSSL and AWS-LC CI configurations - #144805

Merged
hugovk merged 9 commits into
python:mainfrom
zware:bump_multissl_awslc
Mar 1, 2026
Merged

gh-136728: Combine OpenSSL and AWS-LC CI configurations#144805
hugovk merged 9 commits into
python:mainfrom
zware:bump_multissl_awslc

Conversation

@zware

@zwarezware commented Feb 13, 2026•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

I accidentally started this before finding GH-143940, but given the somewhat different approach I figured it was worth sharing anyway. If we prefer the GH-143940 approach, this can just be closed.

@zwarezware added tests Tests in the Lib/test dir topic-SSL infra CI, GitHub Actions, buildbots, Dependabot, etc. type-refactor Code refactoring (with no changes in behavior) labels Feb 13, 2026
@bedevere-appbedevere-appBot mentioned this pull request Feb 13, 2026
Open
zware
zware commented Feb 13, 2026
View reviewed changes
Comment thread.github/workflows/build.yml Outdated
hugovk
hugovk reviewed Feb 13, 2026
View reviewed changes

@hugovkhugovk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this approach also looks fine by me :)

Comment threadTools/ssl/multissltests.py
Comment thread.github/workflows/build.yml Outdated
Comment thread.github/workflows/build.yml Outdated
@zware
fixup!pythongh-136728: Combine OpenSSL and AWS-LC CI configurations
402c06d
Collapse matrix entries into more concise one line each.
@zware
fixup!pythongh-136728: Combine OpenSSL and AWS-LC CI configurations
4676575
Remove obsolete OpenSSL 1.1.1w; AWS-LC is roughly 1.1.1-shaped and
exercises the relevant APIs.
@zware
fixup!pythongh-136728: Combine OpenSSL and AWS-LC CI configurations
2543718
Remove AWS-LC 1.55.0; just test the single latest version.
hugovk
hugovk approved these changes Feb 17, 2026
View reviewed changes

@hugovkhugovk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks both!

@zware
zware marked this pull request as ready for review February 17, 2026 15:13
webknjaz
webknjaz reviewed Feb 17, 2026
View reviewed changes
Comment thread.github/workflows/build.yml
ssllib:
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
## OpenSSL
- { name: openssl, version: 3.0.19 }

@webknjazwebknjazFeb 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nested objects in the matrix generally cause difficulties. So yes, that other PR solves this bit better. I understand the desire to couple libs with their versions and it might be reasonable to just use strings like openssl == 3.0.19 and split them where necessary.

@zwarezwareFeb 17, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What difficulties?

webknjaz
webknjaz reviewed Feb 17, 2026
View reviewed changes
Comment thread.github/workflows/build.yml Outdated
picnixz
picnixz approved these changes Feb 28, 2026
View reviewed changes

@picnixzpicnixz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok for thoses changes. I don't know about the changes for GHA.

@hugovk
hugovk merged commit c9b96b1 into python:mainMar 1, 2026
91 of 92 checks passed
@hugovkhugovk mentioned this pull request Mar 1, 2026
Closed
@hugovk

hugovk commented Mar 1, 2026

Copy link
Copy Markdown
Member

Can we backport this, if it's not too difficult? Will make future maintenance easier.

@bedevere-bot

This comment was marked as off-topic.

Sign in to view
@zware
zware deleted the bump_multissl_awslc branch March 1, 2026 17:52
@zwarezware added the needs backport to 3.14 bugs and security fixes label Mar 1, 2026
@miss-islington-app

miss-islington-appBot commented Mar 1, 2026

Copy link
Copy Markdown

Thanks @zware for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-appBot commented Mar 1, 2026

Copy link
Copy Markdown

Sorry, @zware and @hugovk, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker c9b96b1e6fea13dc2879dcc626015c06dc0056ac 3.14

@zware

zware commented Mar 1, 2026

Copy link
Copy Markdown
MemberAuthor

It's apparently not that easy to backport :). I'll give it a try.

@zwarezware assigned zware and unassigned hugovkMar 1, 2026
zware added a commit to zware/cpython that referenced this pull request Mar 1, 2026
@zware
[3.14]pythongh-136728: Combine OpenSSL and AWS-LC CI configurations (p…
48c09f4
…ythonGH-144805)
(cherry picked from commit c9b96b1)
Co-authored-by: Zachary Ware <zach@python.org>
@bedevere-app

bedevere-appBot commented Mar 1, 2026

Copy link
Copy Markdown

GH-145397 is a backport of this pull request to the 3.14 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.14 bugs and security fixes label Mar 1, 2026
ambv added a commit that referenced this pull request Mar 23, 2026
@zware@ambv
[3.14]gh-136728: Combine OpenSSL and AWS-LC CI configurations (GH-14…
d64665b
…4805) (GH-145397)
(cherry picked from commit c9b96b1)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
ljfp pushed a commit to ljfp/cpython that referenced this pull request Apr 25, 2026
@zware@ljfp
pythongh-136728: Combine OpenSSL and AWS-LC CI configurations (python…
c1ea32d
…#144805)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@webknjazwebknjazwebknjaz left review comments
@hugovkhugovkhugovk approved these changes
@picnixzpicnixzpicnixz approved these changes
@gpsheadgpsheadAwaiting requested review from gpsheadgpshead is a code owner
@ezio-melottiezio-melottiAwaiting requested review from ezio-melottiezio-melotti is a code owner
@AA-TurnerAA-TurnerAwaiting requested review from AA-TurnerAA-Turner is a code owner
+1 more reviewer
@WillChilds-KleinWillChilds-KleinWillChilds-Klein left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@zwarezware

Labels

infraCI, GitHub Actions, buildbots, Dependabot, etc.skip newstestsTests in the Lib/test dirtopic-SSLtype-refactorCode refactoring (with no changes in behavior)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@zware@hugovk@bedevere-bot@webknjaz@WillChilds-Klein@picnixz