Skip to content

Commit 690fc89

Browse files
authored
Update build to support Bazel 8/bzlmod (#248)
1 parent 0c58fa7 commit 690fc89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+9306
-12593
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.4.0
1+
8.1.1

.github/workflows/ci-cpp-build-gnoi.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ jobs:
2121
uses: bazelbuild/setup-bazelisk@v3
2222
- name: Build
2323
run: bazel build //...
24+
- name: Test
25+
run: bazel test //...

BUILD.bazel

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
#
1515
# Supporting infrastructure for implementing and testing PINS.
16-
load("@bazel_gazelle//:def.bzl", "gazelle")
16+
load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_test")
1717

1818
package(
1919
default_visibility = ["//visibility:public"],
@@ -22,7 +22,32 @@ package(
2222

2323
exports_files(["LICENSE"])
2424

25+
# gazelle:go_grpc_compilers @io_bazel_rules_go//proto:go_grpc_v2, @io_bazel_rules_go//proto:go_proto
26+
# gazelle:proto_import_prefix github.com/openconfig/gnoi
2527
# gazelle:prefix github.com/openconfig/gnoi
28+
# gazelle:resolve proto go google/rpc/status.proto @org_golang_google_genproto_googleapis_rpc//status
29+
# gazelle:resolve proto google/rpc/status.proto @com_google_googleapis//google/rpc:status_proto
30+
# gazelle:resolve proto go github.com/openconfig/bootz/proto/bootz.proto @openconfig_bootz//proto:bootz
31+
# gazelle:resolve proto github.com/openconfig/bootz/proto/bootz.proto @openconfig_bootz//proto:bootz_proto
32+
# gazelle:resolve proto go github.com/openconfig/gnsi/authz/authz.proto @openconfig_gnsi//authz:authz
33+
# gazelle:resolve proto github.com/openconfig/gnsi/authz/authz.proto @openconfig_gnsi//authz:authz_proto
34+
# gazelle:resolve proto go github.com/openconfig/gnsi/certz/certz.proto @openconfig_gnsi//certz:certz
35+
# gazelle:resolve proto github.com/openconfig/gnsi/certz/certz.proto @openconfig_gnsi//certz:certz_proto
36+
# gazelle:resolve proto go github.com/openconfig/gnsi/pathz/pathz.proto @openconfig_gnsi//pathz:pathz
37+
# gazelle:resolve proto github.com/openconfig/gnsi/pathz/pathz.proto @openconfig_gnsi//pathz:pathz_proto
2638
gazelle(name = "gazelle")
2739

28-
# gazelle:exclude **.pb.go
40+
gazelle(
41+
name = "gazelle_update_repos",
42+
args = [
43+
"-from_file=go.mod",
44+
"-to_macro=gnoi_go_deps.bzl%gnoi_go_deps",
45+
"-prune",
46+
],
47+
command = "update-repos",
48+
)
49+
50+
gazelle_test(
51+
name = "gazelle_test",
52+
workspace = "//:BUILD.bazel",
53+
)

MODULE.bazel

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1-
###############################################################################
2-
# Bazel now uses Bzlmod by default to manage external dependencies.
3-
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
4-
#
5-
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
6-
###############################################################################
1+
module(
2+
name = "openconfig_gnoi",
3+
version = "0.0.0",
4+
)
5+
6+
bazel_dep(name = "gazelle", version = "0.41.0", repo_name = "bazel_gazelle")
7+
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis")
8+
bazel_dep(name = "grpc", version = "1.69.0", repo_name = "com_github_grpc_grpc")
9+
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
10+
bazel_dep(name = "rules_go", version = "0.51.0", repo_name = "io_bazel_rules_go")
11+
bazel_dep(name = "rules_proto", version = "7.0.2")
12+
bazel_dep(name = "openconfig_bootz", version = "0.5.0")
13+
bazel_dep(name = "openconfig_gnsi", version = "1.9.0")
14+
15+
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
16+
go_sdk.download(version = "1.24.1")
17+
18+
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
19+
go_deps.from_file(go_mod = "//:go.mod")
20+
use_repo(go_deps, "com_github_golang_protobuf", "org_golang_google_genproto_googleapis_rpc", "org_golang_google_grpc", "org_golang_google_grpc_cmd_protoc_gen_go_grpc", "org_golang_google_protobuf")

0 commit comments

Comments
 (0)