Skip to content

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

Merged
hugovk merged 3 commits into
python:mainfrom
webknjaz:maintenance/111758-gha-combined-san
Jul 20, 2025
Merged

GH-111758: Merge TSan and UBSan reusable GHA workflows#136820
hugovk merged 3 commits into
python:mainfrom
webknjaz:maintenance/111758-gha-combined-san

Conversation

@webknjaz

@webknjazwebknjaz commented Jul 19, 2025•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

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-appbedevere-appBot mentioned this pull request Jul 19, 2025
Closed
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
Comment thread.github/workflows/reusable-san.yml
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
Comment thread.github/workflows/reusable-san.yml Outdated
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
Comment thread.github/workflows/reusable-ubsan.yml

@webknjazwebknjazJul 19, 2025

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.

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
Comment thread.github/workflows/build.yml Outdated
webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
Comment thread.github/workflows/reusable-san.yml Outdated
build-tsan-reusable:
name: 'Thread sanitizer'
build-san-reusable:
name: ${{ inputs.sanitizer }}

@webknjazwebknjazJul 19, 2025

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.

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

webknjaz
webknjaz commented Jul 19, 2025
View reviewed changes
Comment thread.github/workflows/reusable-san.yml Outdated
@webknjaz
webknjazforce-pushed the maintenance/111758-gha-combined-san branch 2 times, most recently from 8592567 to 115b8e3CompareJuly 20, 2025 09:33
hugovkand others added 2 commits July 20, 2025 12:51
@hugovk@webknjaz
Merge reusable-tsan.yml and reusable-ubsan.yml
8332820
Co-Authored-By: Sviatoslav Sydorenko <webknjaz@redhat.com>
@webknjaz
Merge TSan and UBSan CI matrices
219e287
@webknjaz
webknjazforce-pushed the maintenance/111758-gha-combined-san branch from 115b8e3 to 219e287CompareJuly 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
Comment thread.github/workflows/reusable-san.yml Outdated
@webknjaz@hugovk
Expand "free-threading" in the job label
50413d4
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@webknjaz
webknjaz requested a review from hugovkJuly 20, 2025 17:19
@webknjaz

webknjaz commented Jul 20, 2025

Copy link
Copy Markdown
MemberAuthor

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

@hugovkhugovk 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

@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.

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:mainJul 20, 2025
48 checks passed
@miss-islington-app

miss-islington-appBot commented Jul 20, 2025

Copy link
Copy Markdown

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

miss-islington-appBot commented Jul 20, 2025

Copy link
Copy Markdown

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

bedevere-appBot commented Jul 20, 2025

Copy link
Copy Markdown

GH-136883 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 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 (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@hugovk

hugovk commented Jul 20, 2025

Copy link
Copy Markdown
Member

@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

webknjaz commented Jul 20, 2025

Copy link
Copy Markdown
MemberAuthor

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

encukou commented Jul 21, 2025

Copy link
Copy Markdown
Member

@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 <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
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 <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
@webknjazwebknjaz mentioned this pull request Jul 23, 2025
Merged
@bedevere-app

bedevere-appBot commented Jul 23, 2025

Copy link
Copy Markdown

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

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label Jul 23, 2025
encukou pushed a commit that referenced this pull request Aug 1, 2025
@webknjaz@hugovk
[3.13]GH-111758: Merge TSan and UBSan reusable GHA workflows (#136820)…
6a217ce
… (GH-137029)
(cherry picked from commit 65d2c51)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
@webknjaz@hugovk@taegyunkim
pythonGH-111758: Merge TSan and UBSan reusable GHA workflows (python#…
ad8bc56
…136820)
Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Agent-Hellboy pushed a commit to Agent-Hellboy/cpython that referenced this pull request Aug 19, 2025
@webknjaz@hugovk@Agent-Hellboy
pythonGH-111758: Merge TSan and UBSan reusable GHA workflows (python#…
a14be76
…136820)
Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
kumaraditya303 pushed a commit to miss-islington/cpython that referenced this pull request Sep 9, 2025
@miss-islington@webknjaz
@hugovk@kumaraditya303
[3.14]pythonGH-111758: Merge TSan and UBSan reusable GHA workflows (p…
f740369
…ythonGH-136820) (python#136883)
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@thesamesamthesamesam mentioned this pull request Apr 6, 2026
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hugovkhugovkhugovk approved these changes
@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

Assignees

@hugovkhugovk

Labels

skip newssprint

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@webknjaz@hugovk@encukou@AA-Turner@StanFromIreland