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

WIP: bzlmod reprise #382

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
build(//:gazelle-protobuf) OK
pcj committed Jun 29, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
scareything Shawn Carey
commit 9b891e0fdc50c3179fa35f38bb84cb8920d07c6b
8 changes: 1 addition & 7 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
load("@gazelle//:def.bzl", "gazelle", "gazelle_binary")
# load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
# load("@npm_ts_proto//:defs.bzl", "npm_link_all_packages")
# load("@//rules:proto_gazelle.bzl", "proto_gazelle")

exports_files(["rules_proto_config.yaml"])

# ----------------------------------------------------
# Buildifier
# ----------------------------------------------------
# buildifier(name = "buildifier")

# ----------------------------------------------------
# Gazelle
# ----------------------------------------------------
@@ -26,7 +20,7 @@ gazelle_binary(
# //language/protobuf MUST come after language/proto.
"@gazelle//language/go",
"@gazelle//language/proto",
# "//language/protobuf",
"//language/protobuf",
],
visibility = ["//visibility:public"],
)
43 changes: 42 additions & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
@@ -4,4 +4,45 @@ module(
compatibility_level = 1,
)

bazel_dep(name = "gazelle", version = "0.35.0", dev_dependency = False)
bazel_dep(name = "gazelle", version = "0.35.0", dev_dependency = True)
bazel_dep(name = "rules_go", version = "0.45.1", dev_dependency = True)

go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")

go_deps.module(
# name = "com_github_bmatcuk_doublestar",
# build_file_proto_mode = "disable_global",
path = "github.com/bmatcuk/doublestar",
sum = "h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=",
version = "v1.3.4",
)
go_deps.module(
path = "github.com/emicklei/proto",
sum = "h1:YtC/om6EdkJ0me1JPw4h2g10k+ELITjYFb7tpzm8i8k=",
version = "v1.13.0",
)
go_deps.module(
path = "go.starlark.net",
sum = "h1:hzy3LFnSN8kuQK8h9tHl4ndF6UruMj47OqwqsS+/Ai4=",
version = "v0.0.0-20231121155337-90ade8b19d09",
)
go_deps.module(
path = "github.com/bazelbuild/buildtools",
sum = "h1:2Gc2Q6hVR1SJ8bBI9Ybzoggp8u/ED2WkM4MfvEIn9+c=",
version = "v0.0.0-20231115204819-d4c9dccdfbb1",
)

go_deps.module(
path = "gopkg.in/yaml.v3",
sum = "h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=",
version = "v3.0.1",
)

use_repo(
go_deps,
"com_github_bmatcuk_doublestar",
"com_github_emicklei_proto",
"net_starlark_go",
"com_github_bazelbuild_buildtools",
"in_gopkg_yaml_v3",
)
119 changes: 86 additions & 33 deletions MODULE.bazel.lock

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

4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ tidy: deps
bazel run @go_sdk//:bin/go -- mod vendor
find vendor -name 'BUILD.bazel' | xargs rm
bazel run //:update_go_deps
bazel run //:buildifier
bazel run //:gazelle

.PHONY: gazelle
@@ -17,8 +16,7 @@ deps:
bazel build //deps:*
cp -f ./bazel-bin/deps/*.bzl deps/
chmod 0644 deps/*.bzl
bazel run //:buildifier -- deps/


.PHONY: site
site:
bazel build //example/golden:*
2 changes: 1 addition & 1 deletion cmd/depsgen/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("@rules_go//go:def.bzl", "go_binary", "go_library")

go_library(
name = "depsgen_lib",
2 changes: 1 addition & 1 deletion cmd/examplegen/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("@rules_go//go:def.bzl", "go_binary", "go_library")

go_library(
name = "examplegen_lib",
30 changes: 15 additions & 15 deletions cmd/gazelle/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
load("@rules_go//go:def.bzl", "go_binary", "go_library", "go_test")

go_library(
name = "gazelle_lib",
@@ -21,18 +21,18 @@ go_library(
"//cmd/gazelle/internal/module",
"//cmd/gazelle/internal/wspace",
"//language/protobuf",
"@bazel_gazelle//config:go_default_library",
"@bazel_gazelle//flag:go_default_library",
"@bazel_gazelle//label:go_default_library",
"@bazel_gazelle//language:go_default_library",
"@bazel_gazelle//language/go:go_default_library",
"@bazel_gazelle//language/proto:go_default_library",
"@bazel_gazelle//merger:go_default_library",
"@bazel_gazelle//repo:go_default_library",
"@bazel_gazelle//resolve:go_default_library",
"@bazel_gazelle//rule:go_default_library",
"@bazel_gazelle//walk:go_default_library",
"@com_github_pmezard_go_difflib//difflib",
"@gazelle//config:go_default_library",
"@gazelle//flag:go_default_library",
"@gazelle//label:go_default_library",
"@gazelle//language:go_default_library",
"@gazelle//language/go:go_default_library",
"@gazelle//language/proto:go_default_library",
"@gazelle//merger:go_default_library",
"@gazelle//repo:go_default_library",
"@gazelle//resolve:go_default_library",
"@gazelle//rule:go_default_library",
"@gazelle//walk:go_default_library",
],
)

@@ -53,9 +53,9 @@ go_test(
data = ["@go_sdk//:files"],
embed = [":gazelle_lib"],
deps = [
"@bazel_gazelle//config:go_default_library",
"@bazel_gazelle//testtools:go_default_library",
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
"@gazelle//config:go_default_library",
"@gazelle//testtools:go_default_library",
"@rules_go//go/tools/bazel:go_default_library",
],
)

2 changes: 1 addition & 1 deletion cmd/gazelle/internal/module/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("@rules_go//go:def.bzl", "go_library")

go_library(
name = "module",
2 changes: 1 addition & 1 deletion cmd/gazelle/internal/wspace/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
load("@rules_go//go:def.bzl", "go_library", "go_test")

go_library(
name = "wspace",
Loading