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

Bundle jemalloc #133

Merged
merged 5 commits into from
Jan 31, 2025
Merged

Bundle jemalloc #133

merged 5 commits into from
Jan 31, 2025

Conversation

lnkuiper
Copy link
Contributor

Trying to help out #131

I don't think it's necessary to vendor in the changes, the CI will do that by itself. Just changing the vendor script should be enough. This should hopefully avoid conflicts.

Big thanks to @brianwyka for making the changes to the script! I simply copied them here.

@lnkuiper lnkuiper changed the title Budle jemalloc Bundle jemalloc Jan 22, 2025
@lnkuiper
Copy link
Contributor Author

I didn't touch the file that failed the format check, so I think it's fine

@hannes
Copy link
Member

hannes commented Jan 22, 2025

Can you perhaps fix the format while you're here

@brianwyka
Copy link
Contributor

Thanks @lnkuiper !

@lnkuiper
Copy link
Contributor Author

@hannes, I've fixed the format check. The issue was not wrongly formatted code, but the clang-format version in CI was wrong. I've now made it install the same version as we use in the main duckdb repo again.

@lnkuiper lnkuiper requested a review from hannes January 30, 2025 10:10
@hannes hannes merged commit 45e5a92 into duckdb:main Jan 31, 2025
7 checks passed
@brianwyka
Copy link
Contributor

Thanks for getting this merged!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants