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

feat: Add bzlmod support #1

Merged
merged 17 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# To update these lines, execute
# `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
build --deleted_packages=fixtures/simple/output_base/external/bar,fixtures/simple/output_base/external/foo,fixtures/simple/root,fixtures/simple/root/foo
query --deleted_packages=fixtures/simple/output_base/external/bar,fixtures/simple/output_base/external/foo,fixtures/simple/root,fixtures/simple/root/foo
build --deleted_packages=fixtures/bzlmod/root,fixtures/simple/output_base/external/bar,fixtures/simple/output_base/external/foo,fixtures/simple/root,fixtures/simple/root/foo
query --deleted_packages=fixtures/bzlmod/root,fixtures/simple/output_base/external/bar,fixtures/simple/output_base/external/foo,fixtures/simple/root,fixtures/simple/root/foo

build:ci --bes_results_url=https://bazel-lsp.buildbuddy.io/invocation/
build:ci --bes_backend=grpcs://bazel-lsp.buildbuddy.io
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.2
7.1.0rc1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/bazel-*
/MODULE.bazel.lock
/rust-project.json
/fixtures/*/root/bazel-*
1 change: 1 addition & 0 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ rust_binary(
"@crates//:hex",
"@crates//:lsp-types",
"@crates//:ring",
"@crates//:serde_json",
"@crates//:starlark",
"@crates//:starlark_lsp",
"@crates//:thiserror",
Expand Down
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ prost-types = "0.12.3"
protoc-gen-prost = "0.2.3"
protoc-gen-tonic = "0.3.0"
ring = "0.17.7"
serde = "1.0.195"
serde_json = "1.0.111"
starlark = { git = "https://github.com/facebookexperimental/starlark-rust.git", branch = "main" }
starlark_lsp = { git = "https://github.com/facebookexperimental/starlark-rust.git", branch = "main" }
thiserror = "1.0.56"
Expand Down
Empty file added WORKSPACE
Empty file.
Empty file.
7 changes: 7 additions & 0 deletions fixtures/bzlmod/root/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
load("@rules_rust//rust:defs.bzl", "rust_binary")

rust_binary(
name = "main",
srcs = ["main.rs"],
deps = ["@rules_ru"]
)
1 change: 1 addition & 0 deletions fixtures/bzlmod/root/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bazel_dep(name = "rules_rust", version = "0.36.2")
Loading