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

Make Stardoc work with --incompatible_enable_proto_toolchain_resolution. #237

Merged
merged 3 commits into from
Jun 21, 2024

Conversation

lberki
Copy link
Contributor

@lberki lberki commented Jun 21, 2024

No description provided.

@lberki lberki force-pushed the lberki-proto-toolchains branch from 05510e0 to 4cfb410 Compare June 21, 2024 10:43
@lberki lberki force-pushed the lberki-proto-toolchains branch from 4cfb410 to b5da35e Compare June 21, 2024 10:51
@lberki
Copy link
Contributor Author

lberki commented Jun 21, 2024

I'll wait for @tetromino , too

@tetromino
Copy link
Collaborator

Thanks for doing this migration!

Copy link
Collaborator

@tetromino tetromino left a comment

Choose a reason for hiding this comment

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

LGTM

The only nit is that the rules_jvm_external.patch file is no longer needed - I took the liberty of deleting it for you

@tetromino tetromino merged commit 7f06016 into master Jun 21, 2024
18 checks passed
@tetromino tetromino deleted the lberki-proto-toolchains branch June 21, 2024 15:41
@lberki
Copy link
Contributor Author

lberki commented Jun 21, 2024

D'oh! I actually deleted that file in one of the previous versions of this change, but managed to lost that in all the rebasing I did after :(

tetromino added a commit to tetromino/stardoc that referenced this pull request Jul 9, 2024
As the review of bazelbuild#241 showed, --incompatible_enable_proto_toolchain_resolution
is not ready yet; we will re-add support for it in Stardoc when we no
longer need to register our own protoc toolchain in Stardoc's
MODULE.bazel file.

The only parts of bazelbuild#237 we keep are the rules_jvm_external and
rules_proto dep bumps; note that the rules_proto dep bump in turn
requires a new dependency on bazel_features when using a Stardoc distro
release with --noenable_blzmod.
tetromino added a commit that referenced this pull request Jul 17, 2024
As the review of #241 showed, `--incompatible_enable_proto_toolchain_resolution` is not ready yet; we will re-add support for it in Stardoc when we no longer need to register our own protoc toolchain in Stardoc's MODULE.bazel file.

The only parts of #237 we keep are the rules_jvm_external and rules_proto dep bumps; note that the rules_proto dep bump in turn requires a new dependency on bazel_features when using a Stardoc distro release with `--noenable_blzmod.`

Also revert most of #238 - we're no longer testing `--incompatible_enable_proto_toolchain_resolution`
avdv pushed a commit to tweag/rules_sh that referenced this pull request Dec 12, 2024
Unfortunately, they broke compatiblity with Bazel 6 in stardoc 0.7.1 (by
upgrading rules_jvm_external to 6.1 which uses `use_repo_rule` in its
MODULE.bazel in PR bazelbuild/stardoc#237).
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