Skip to content

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

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

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

Conversation

@zware
Copy link
Member

@zware zware commented Feb 13, 2026

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.

@zware zware 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
Copy link
Member

@hugovk hugovk left a comment

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 :)

Collapse matrix entries into more concise one line each.
Remove obsolete OpenSSL 1.1.1w; AWS-LC is roughly 1.1.1-shaped and
exercises the relevant APIs.
Remove AWS-LC 1.55.0; just test the single latest version.
Copy link
Member

@hugovk hugovk left a comment

Choose a reason for hiding this comment

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

Thanks both!

ssllib:
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
## OpenSSL
- { name: openssl, version: 3.0.19 }
Copy link
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.

Copy link
Member Author

Choose a reason for hiding this comment

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

What difficulties?

Copy link
Member

@picnixz picnixz left a comment

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:main Mar 1, 2026
91 of 92 checks passed
@hugovk
Copy link
Member

hugovk commented Mar 1, 2026

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

@bedevere-bot

This comment was marked as off-topic.

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

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

@miss-islington-app
Copy link

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
Copy link
Member Author

zware commented Mar 1, 2026

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

@zware zware assigned zware and unassigned hugovk Mar 1, 2026
zware added a commit to zware/cpython that referenced this pull request Mar 1, 2026
…ythonGH-144805)

(cherry picked from commit c9b96b1)

Co-authored-by: Zachary Ware <zach@python.org>
@bedevere-app
Copy link

bedevere-app bot commented Mar 1, 2026

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

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Mar 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

infra CI, GitHub Actions, buildbots, Dependabot, etc. skip news tests Tests in the Lib/test dir topic-SSL type-refactor Code refactoring (with no changes in behavior)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants