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 25.1.x back into main #5631

Merged
merged 4 commits into from
Feb 28, 2025
Merged

Conversation

kenodegard
Copy link
Contributor

Description

Supersedes #5630
Xref #5578

Warning

DO NOT SQUASH MERGE!

travishathaway and others added 4 commits January 30, 2025 13:43
…5595)

* handle lief 0.15 renaming of LOAD_COMMAND_TYPES

https://lief.re/doc/stable/changelog.html#july-21th-2024

* Create 5595-more-lief-compat

* adapt rpath tests for LOAD_COMMAND_TYPES renaming

* lief.ELF.ELF_CLASS was moved to lief.ELF.Header.CLASS

in lief 0.15

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Update CHANGELOG.md

---------

Co-authored-by: Ken Odegard <[email protected]>
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Feb 27, 2025
This was referenced Feb 27, 2025
Copy link

codspeed-hq bot commented Feb 27, 2025

CodSpeed Performance Report

Merging #5631 will not alter performance

Comparing kenodegard:25.1.x-connector (6c5af02) with main (bfb9496)

Summary

✅ 5 untouched benchmarks

@kenodegard kenodegard marked this pull request as ready for review February 27, 2025 20:45
@kenodegard kenodegard requested a review from a team as a code owner February 27, 2025 20:45
@kenodegard kenodegard merged commit 8219e9e into conda:main Feb 28, 2025
31 checks passed
@kenodegard kenodegard deleted the 25.1.x-connector branch February 28, 2025 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Status: 🏁 Done
Development

Successfully merging this pull request may close these issues.

8 participants