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.

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

Prefer sysroot matching subdir when there are multiple #5404

Merged
merged 5 commits into from
Jul 15, 2024
Merged

Prefer sysroot matching subdir when there are multiple #5404

merged 5 commits into from
Jul 15, 2024

Conversation

isuruf
Copy link
Contributor

@isuruf isuruf commented Jul 11, 2024 •
edited by kenodegard
Loading

Description

Improves sysroot selection.

Fixes #5403

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jul 11, 2024
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Jul 11, 2024 •
edited
Loading

CodSpeed Performance Report

Merging #5404 will not alter performance

Comparing isuruf:sysroot-prefer (f1b4d99) with main (2a0bf93)

Summary

✅ 3 untouched benchmarks

@h-vetinari h-vetinari mentioned this pull request Jul 12, 2024
Closed
2 tasks
@h-vetinari
Copy link
Contributor

I tested this PR in conda-forge/matplotlib-feedstock#398 and it works! Great work!

kenodegard
kenodegard requested changes Jul 12, 2024
View reviewed changes
Copy link
Contributor

@kenodegard kenodegard left a comment

Choose a reason for hiding this comment

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

@isuruf I see this is still in draft mode, if you're not ready for reviews feel free to ignore these comments

conda_build/post.py Outdated Show resolved Hide resolved
conda_build/post.py Show resolved Hide resolved
@isuruf isuruf marked this pull request as ready for review July 12, 2024 16:50
@isuruf isuruf requested a review from a team as a code owner July 12, 2024 16:50
kenodegard
kenodegard previously approved these changes Jul 12, 2024
View reviewed changes
Copy link
Contributor

@kenodegard kenodegard left a comment

Choose a reason for hiding this comment

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

Minor suggestion, otherwise LGTM!

conda_build/post.py Outdated Show resolved Hide resolved
@isuruf @kenodegard
Make the code more readable
f1b4d99 
Co-authored-by: Ken Odegard <[email protected]>
@kenodegard kenodegard merged commit 4839e39 into conda:main Jul 15, 2024
28 checks passed
@beeankha beeankha mentioned this pull request Jul 16, 2024
Closed
55 tasks
@kenodegard
Copy link
Contributor

tests/test_api_build.py::test_sysroots_detection implemented here is now failing on main, see https://github.com/conda/conda-build/actions/runs/10671805383/job/29578195906

@kenodegard kenodegard mentioned this pull request Sep 3, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@beeankha beeankha beeankha approved these changes

@kenodegard kenodegard kenodegard approved these changes

Assignees
No one assigned
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
🔎 Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

BUG: link check fails to detect sysroot on PPC if build_platform sysroot >2.12
5 participants
@isuruf @h-vetinari @kenodegard @beeankha @conda-bot