-
Notifications
You must be signed in to change notification settings - Fork 421
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
chore(bazel): add MODULE.bazel files for bzlmod #1245
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
82eb6ac
chore(bazel): add MODULE.bazel files for bzlmod
mmorel-35 90326e4
fix path of test_common.sh
mmorel-35 5964102
Merge branch 'main' into bzlmod
vladmos c71b0b4
Update the versions to the latest available
vladmos b0bf5e7
Change the extension name
vladmos 787cbcc
Regenerate *gen.pb.go files
vladmos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,3 +4,4 @@ | |
| .ijwb | ||
| *.iml | ||
| /.bazelrc.user | ||
| MODULE.bazel.lock | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,49 @@ | ||
| # TODO: migrate all dependencies from WORKSPACE to MODULE.bazel | ||
| # https://github.com/bazelbuild/buildtools/issues/1204 | ||
| module( | ||
| name = "buildtools", | ||
| version = "0.0.0", | ||
| ) | ||
|
|
||
| bazel_dep(name = "aspect_bazel_lib", version = "2.7.9") | ||
| bazel_dep(name = "aspect_rules_js", version = "2.0.0-rc9") | ||
| bazel_dep(name = "bazel_features", version = "1.14.0") | ||
| bazel_dep(name = "bazel_skylib", version = "1.7.1") | ||
| bazel_dep(name = "gazelle", version = "0.37.0", repo_name = "bazel_gazelle") | ||
| bazel_dep(name = "protobuf", version = "28.0-rc1", repo_name = "com_google_protobuf") | ||
| bazel_dep(name = "rules_go", version = "0.49.0", repo_name = "io_bazel_rules_go") | ||
| bazel_dep(name = "rules_nodejs", version = "6.2.0") | ||
| bazel_dep(name = "rules_proto", version = "6.0.2") | ||
| # -- bazel_dep definitions -- # | ||
|
|
||
| go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") | ||
| go_sdk.download(version = "1.20.3") | ||
|
|
||
| go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") | ||
| go_deps.from_file(go_mod = "//:go.mod") | ||
| go_deps.module( | ||
| path = "golang.org/x/tools", | ||
| sum = "h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=", | ||
| version = "v0.15.0", | ||
| ) | ||
| use_repo( | ||
| go_deps, | ||
| "com_github_golang_protobuf", | ||
| "com_github_google_go_cmp", | ||
| "net_starlark_go", | ||
| "org_golang_google_protobuf", | ||
| "org_golang_x_tools", | ||
| ) | ||
|
|
||
| node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node") | ||
| node.toolchain( | ||
| name = "nodejs", | ||
| node_version = "16.7.0", | ||
| ) | ||
|
|
||
| toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") | ||
| use_repo(toolchains, "jq_toolchains") | ||
| use_repo(toolchains, "copy_to_directory_toolchains") | ||
|
|
||
| register_toolchains( | ||
| "@jq_toolchains//:all", | ||
| "@copy_to_directory_toolchains//:all", | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| module github.com/bazelbuild/buildtools | ||
|
|
||
| go 1.15 | ||
| go 1.20 | ||
|
|
||
| require ( | ||
| github.com/golang/protobuf v1.4.3 | ||
| github.com/google/go-cmp v0.5.9 | ||
| go.starlark.net v0.0.0-20210223155950-e043a3d3c984 | ||
| google.golang.org/protobuf v1.25.0 | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's this file? Is it being created by your editor?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's the lockfile Bazel creates for
MODULE.bazel. It is currently hard to share across machines, which is why it's commonly added to.gitignore.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bzlmod has a lockfile which afaiui the primary feature is it allows you to build offline. but it is pretty verbose, and i believe there are some cross-platform holes in it today, so it adds some maintenance burden to check in unless you really need it. ignoring it allows you the benefits locally w/o having to deal with updating it