Skip to content

GH-111758: Merge TSan and UBSan reusable GHA workflows #136820

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

Jump to bottom
Merged
merged 3 commits into from
Jul 20, 2025
Merged

GH-111758: Merge TSan and UBSan reusable GHA workflows #136820

merged 3 commits into from
Jul 20, 2025

Conversation

webknjaz
Copy link
Contributor

@webknjaz webknjaz commented Jul 19, 2025 •
edited by bedevere-app bot
Loading

This patch deduplicates the contents of reusable-tsan.yml and reusable-ubsan.yml, making them one. The new workflow replaces the duplicated ones in the top-level build.yml and are called with different sanitizer parameters.

It is based on Hugo's patch. Context:

@bedevere-app bedevere-app bot mentioned this pull request Jul 19, 2025
Closed
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
.github/workflows/reusable-ubsan.yml Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note

Prior to this PR, this workflow wasn't contributing to the branch protection status. Once it's merged, it'll fail the PRs if something crashes.

webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
.github/workflows/reusable-san.yml Outdated
build-tsan-reusable:
name: 'Thread sanitizer'
build-san-reusable:
name: ${{ inputs.sanitizer }}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Per discussion w/ Hugo, this needs to mention the FT flag.

webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
@webknjaz webknjaz force-pushed the maintenance/111758-gha-combined-san branch 2 times, most recently from 8592567 to 115b8e3 Compare July 20, 2025 09:33
@webknjaz webknjaz force-pushed the maintenance/111758-gha-combined-san branch from 115b8e3 to 219e287 Compare July 20, 2025 10:51
@webknjaz webknjaz marked this pull request as ready for review July 20, 2025 12:21
hugovk
hugovk reviewed Jul 20, 2025
View reviewed changes
@webknjaz webknjaz requested a review from hugovk July 20, 2025 17:19
@webknjaz
Copy link
Contributor Author

@hugovk I think this needs backport labels to keep the CI in other branches close.

@hugovk hugovk added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Jul 20, 2025
hugovk
hugovk approved these changes Jul 20, 2025
View reviewed changes
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, this also nicely groups the jobs under a single collapsible thingy 👍

Before:

image

and:

image

After:

image

and:

image

@hugovk hugovk merged commit 65d2c51 into python:main Jul 20, 2025
48 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.13, 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 20, 2025
@webknjaz @hugovk @miss-islington
pythonGH-111758: Merge TSan and UBSan reusable GHA workflows (pythonG…
1e3d1a8 
…H-136820)

(cherry picked from commit 65d2c51)

Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: Sviatoslav Sydorenko <[email protected]>
Co-authored-by: Hugo van Kemenade <[email protected]>
@miss-islington-app
Copy link

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

cherry_picker 65d2c51c10425dcfacc0a13810d58c41240d7ff9 3.13

@bedevere-app
Copy link

bedevere-app bot commented Jul 20, 2025

GH-136883 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 Jul 20, 2025
hugovk added a commit that referenced this pull request Jul 20, 2025
@miss-islington @webknjaz @hugovk
[3.14] GH-111758: Merge TSan and UBSan reusable GHA workflows (GH-136820
2f7684c 
) (#136883)

Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: Sviatoslav Sydorenko <[email protected]>
Co-authored-by: Hugo van Kemenade <[email protected]>
@hugovk
Copy link
Member

hugovk commented Jul 20, 2025

@hugovk I think this needs backport labels to keep the CI in other branches close.

Hmm, we didn't have UBSan in the 3.14 branch yet. I'm fine with having it there (and 3.13), but also to revert #136883 if it's not necessary to backport.

@encukou Should we have this just in main, or also backport?

@webknjaz
Copy link
Contributor Author

but also to revert #136883 if it's not necessary to backport.

I'd suggest reverting partially if needed, but the job grouping and generalization are good to keep.

@encukou
Copy link
Member

encukou commented Jul 21, 2025

@hugovk ultimately up to you, but, if it works on 3.14 I think we should keep it working.
Not on 3.13 though -- we'd need to backport #111178 to make UBSan pass.

webknjaz added a commit to webknjaz/cpython that referenced this pull request Jul 23, 2025
@webknjaz @hugovk
[3.13] pythonGH-111758: Merge TSan and UBSan reusable GHA workflows (p…
8876f0a 
…ython#136820)

(cherry picked from commit 65d2c51)

Co-authored-by: Hugo van Kemenade <[email protected]>
Co-authored-by: Sviatoslav Sydorenko <[email protected]>
webknjaz added a commit to webknjaz/cpython that referenced this pull request Jul 23, 2025
@webknjaz @hugovk
[3.13] pythonGH-111758: Merge TSan and UBSan reusable GHA workflows (p…
96da074 
…ython#136820)

(cherry picked from commit 65d2c51)

Co-authored-by: Hugo van Kemenade <[email protected]>
Co-authored-by: Sviatoslav Sydorenko <[email protected]>
@webknjaz webknjaz mentioned this pull request Jul 23, 2025
Open
@bedevere-app
Copy link

bedevere-app bot commented Jul 23, 2025

GH-137029 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 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hugovk hugovk hugovk approved these changes

@ezio-melotti ezio-melotti Awaiting requested review from ezio-melotti ezio-melotti is a code owner

@AA-Turner AA-Turner Awaiting requested review from AA-Turner AA-Turner is a code owner

Assignees

@hugovk hugovk

Labels
skip news sprint
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@webknjaz @hugovk @encukou @AA-Turner @StanFromIreland