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

Add workaround for segfaults during wheel builds #10400

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Feb 5, 2025

Verified

This commit was signed with the committer’s verified signature.
bdraco J. Nick Koston
@bdraco bdraco requested a review from webknjaz as a code owner February 5, 2025 20:00
@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot labels Feb 5, 2025
@bdraco bdraco enabled auto-merge (squash) February 5, 2025 20:02
Copy link

codecov bot commented Feb 5, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.76%. Comparing base (9057364) to head (02213fe).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10400   +/-   ##
=======================================
  Coverage   98.76%   98.76%           
=======================================
  Files         122      122           
  Lines       37125    37125           
  Branches     2044     2044           
=======================================
  Hits        36666    36666           
  Misses        319      319           
  Partials      140      140           
Flag Coverage Δ
CI-GHA 98.65% <ø> (ø)
OS-Linux 98.33% <ø> (ø)
OS-Windows 96.25% <ø> (-0.01%) ⬇️
OS-macOS 97.45% <ø> (+<0.01%) ⬆️
Py-3.10.11 97.34% <ø> (-0.01%) ⬇️
Py-3.10.16 97.91% <ø> (ø)
Py-3.11.11 98.00% <ø> (ø)
Py-3.11.9 97.42% <ø> (ø)
Py-3.12.8 98.43% <ø> (ø)
Py-3.13.1 98.42% <ø> (ø)
Py-3.9.13 97.23% <ø> (ø)
Py-3.9.21 97.79% <ø> (ø)
Py-pypy7.3.16 97.38% <ø> (ø)
VM-macos 97.45% <ø> (+<0.01%) ⬆️
VM-ubuntu 98.33% <ø> (ø)
VM-windows 96.25% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

codspeed-hq bot commented Feb 5, 2025

CodSpeed Performance Report

Merging #10400 will not alter performance

Comparing segfaults_build (02213fe) with master (9057364)

Summary

✅ 47 untouched benchmarks

@bdraco bdraco merged commit 9b33be3 into master Feb 5, 2025
40 checks passed
@bdraco bdraco deleted the segfaults_build branch February 5, 2025 20:11
Copy link
Contributor

patchback bot commented Feb 5, 2025

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 9b33be3 on top of patchback/backports/3.11/9b33be33d169f19842ae0a0f537163625fe3af77/pr-10400

Backporting merged PR #10400 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/9b33be33d169f19842ae0a0f537163625fe3af77/pr-10400 upstream/3.11
  4. Now, cherry-pick PR Add workaround for segfaults during wheel builds #10400 contents into that branch:
    $ git cherry-pick -x 9b33be33d169f19842ae0a0f537163625fe3af77
    If it'll yell at you with something like fatal: Commit 9b33be33d169f19842ae0a0f537163625fe3af77 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 9b33be33d169f19842ae0a0f537163625fe3af77
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add workaround for segfaults during wheel builds #10400 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/9b33be33d169f19842ae0a0f537163625fe3af77/pr-10400
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Feb 5, 2025

Backport to 3.12: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 9b33be3 on top of patchback/backports/3.12/9b33be33d169f19842ae0a0f537163625fe3af77/pr-10400

Backporting merged PR #10400 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.12/9b33be33d169f19842ae0a0f537163625fe3af77/pr-10400 upstream/3.12
  4. Now, cherry-pick PR Add workaround for segfaults during wheel builds #10400 contents into that branch:
    $ git cherry-pick -x 9b33be33d169f19842ae0a0f537163625fe3af77
    If it'll yell at you with something like fatal: Commit 9b33be33d169f19842ae0a0f537163625fe3af77 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 9b33be33d169f19842ae0a0f537163625fe3af77
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add workaround for segfaults during wheel builds #10400 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/9b33be33d169f19842ae0a0f537163625fe3af77/pr-10400
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

bdraco added a commit that referenced this pull request Feb 5, 2025

Verified

This commit was signed with the committer’s verified signature.
bdraco J. Nick Koston
(cherry picked from commit 9b33be3)
bdraco added a commit that referenced this pull request Feb 5, 2025

Verified

This commit was signed with the committer’s verified signature.
bdraco J. Nick Koston
(cherry picked from commit 9b33be3)
bdraco added a commit that referenced this pull request Feb 5, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…g wheel builds (#10402)

(cherry picked from commit 9b33be3)
bdraco added a commit that referenced this pull request Feb 5, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…g wheel builds (#10401)

(cherry picked from commit 9b33be3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant