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

[BUILD] Add support for bzlmod #2608

Merged
merged 5 commits into from
Jun 14, 2024

Conversation

keith
Copy link
Contributor

@keith keith commented Mar 25, 2024

This adds support for bzlmod, which is bazel's new dependency resolution system.

Theoretically we could now remove the previous dependency management configuration which required flattening all the dependencies, but I left it here for now for users using old versions of bazel.

Fixes: #2334

@keith keith requested a review from a team March 25, 2024 17:34
@keith keith mentioned this pull request Mar 25, 2024
@keith
Copy link
Contributor Author

keith commented Mar 25, 2024

this will probably fail CI with the same issue as #2599

@esigo esigo self-assigned this Mar 25, 2024
@keith keith force-pushed the ks/add-support-for-bzlmod branch from ea5e310 to 8ba900a Compare April 12, 2024 19:38
@keith
Copy link
Contributor Author

keith commented Apr 12, 2024

ok I pushed an update here that seems to fix it at least with c++17, it depends on bazelbuild/bazel-central-registry#1810

@keith keith force-pushed the ks/add-support-for-bzlmod branch from 66ae4c3 to f140acc Compare April 12, 2024 21:02
@keith keith force-pushed the ks/add-support-for-bzlmod branch from f140acc to f9c9ce9 Compare April 22, 2024 15:58
@marcalff marcalff added the pr:fix-merge-conflicts Please fix merge conflicts for this pr label Apr 29, 2024
@marcalff
Copy link
Member

marcalff commented May 6, 2024

Hi @keith

Could you merge with a recent main to resolve conflicts,
and investigate the remaining CI failures for bazel if any ?

Thanks,
-- Marc

@keith keith force-pushed the ks/add-support-for-bzlmod branch from 8f4db8d to 4d070b8 Compare May 6, 2024 20:54
@keith keith marked this pull request as draft May 6, 2024 22:00
@keith
Copy link
Contributor Author

keith commented May 6, 2024

The windows and asan failures here are real.

@marcalff marcalff removed the pr:fix-merge-conflicts Please fix merge conflicts for this pr label May 7, 2024
@keith
Copy link
Contributor Author

keith commented May 23, 2024

hopefully will be unblocked by #2679

@marcalff marcalff added the pr:fix-merge-conflicts Please fix merge conflicts for this pr label Jun 11, 2024
@marcalff
Copy link
Member

@keith

Now that #2679 is merged, could you update this PR and resolve conflicts ?

Looking to include this in the upcoming release.

Thanks.

This adds support for bzlmod, which is bazel's new dependency resolution
system.

Theoretically we could now remove the previous dependency management
configuration which required flattening all the dependencies, but I left
it here for now for users using old versions of bazel.
@keith keith force-pushed the ks/add-support-for-bzlmod branch from 4d070b8 to 28c90ff Compare June 12, 2024 16:40
@keith
Copy link
Contributor Author

keith commented Jun 12, 2024

I think there might still be a grpc ODR issue I have to fix, but we'll see if CI fails

Copy link

codecov bot commented Jun 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.67%. Comparing base (497eaf4) to head (44f193b).
Report is 79 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2608      +/-   ##
==========================================
+ Coverage   87.12%   87.67%   +0.55%     
==========================================
  Files         200      190      -10     
  Lines        6109     5851     -258     
==========================================
- Hits         5322     5129     -193     
+ Misses        787      722      -65     

see 79 files with indirect coverage changes

@keith keith marked this pull request as ready for review June 12, 2024 18:25
@marcalff marcalff removed the pr:fix-merge-conflicts Please fix merge conflicts for this pr label Jun 12, 2024
MODULE.bazel Outdated Show resolved Hide resolved
MODULE.bazel Outdated Show resolved Hide resolved
Copy link
Member

@marcalff marcalff left a comment

Choose a reason for hiding this comment

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

Thanks for the PR.

See minor fixes, and some questions.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
ci/do_ci.sh Show resolved Hide resolved
@keith keith force-pushed the ks/add-support-for-bzlmod branch from f77041e to 1e84d7f Compare June 12, 2024 23:12
@marcalff marcalff changed the title Add support for bzlmod [BUILD] Add support for bzlmod Jun 13, 2024
Copy link
Member

@marcalff marcalff left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the contribution.

@keith
Copy link
Contributor Author

keith commented Jun 13, 2024

thanks!

@marcalff marcalff merged commit 025f42f into open-telemetry:main Jun 14, 2024
50 checks passed
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.

Add bzlmod support
3 participants