Skip to content
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.

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

Merge Ubuntu test matrices in CI #121813

Merged
merged 2 commits into from
Jul 21, 2024

Conversation

webknjaz
Copy link
Contributor

Previously, they were duplicated, with custom commands being passed to the same reusable workflow. This patch moves the commands in and adds a matrix resembling the interface of other OS tests.

Previously, they were duplicated, with custom commands being passed to
the same reusable workflow. This patch moves the commands in and adds
a matrix resembling the interface of other OS tests.
@webknjaz webknjaz force-pushed the maintenance/gha-ubuntu-reusable-collapse branch from c0e2d29 to 7b65aaf Compare July 15, 2024 21:50
@picnixz
Copy link
Contributor

picnixz commented Jul 21, 2024

Should this one have an issue? @hugovk

@webknjaz
Copy link
Contributor Author

@picnixz no, Hugo will apply respective labels later.

@picnixz
Copy link
Contributor

picnixz commented Jul 21, 2024

I've added the skip issue & skip news labels to this PR and the others that are similar. I'll let Hugo add other labels if needed (I couldn't find one related to CI only)

@hugovk hugovk changed the title 🧪💅 Merge Ubuntu test matrices in CI Merge Ubuntu test matrices in CI Jul 21, 2024
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
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.

Thank you!

@hugovk hugovk added needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes and removed awaiting merge labels Jul 21, 2024
@hugovk hugovk merged commit a3f7db9 into python:main Jul 21, 2024
39 checks passed
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 21, 2024
(cherry picked from commit a3f7db9)

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@miss-islington-app
Copy link

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

cherry_picker a3f7db905c5aecda1d06fb60ed382a17e5b9c7aa 3.12

@bedevere-app
Copy link

bedevere-app bot commented Jul 21, 2024

GH-122098 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jul 21, 2024
hugovk added a commit that referenced this pull request Jul 21, 2024
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@hugovk
Copy link
Member

hugovk commented Jul 22, 2024

@webknjaz Please could you do the 3.12 backport? Thanks!

webknjaz added a commit to webknjaz/cpython that referenced this pull request Jul 22, 2024
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>.
(cherry picked from commit a3f7db9)

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
@bedevere-app
Copy link

bedevere-app bot commented Jul 22, 2024

GH-122116 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Jul 22, 2024
@webknjaz
Copy link
Contributor Author

@hugovk I've been meaning to do this. Here you go: #122116.

I suppose other PRs may have similar conflicts due to the boundary w/ and w/o free-treading...

webknjaz added a commit to webknjaz/cpython that referenced this pull request Jul 22, 2024
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>.
(cherry picked from commit a3f7db9)

Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants