Skip to content

Commit af89e4b

Browse files
mortenmjEdSchouten
mortenmj
authored and
EdSchouten
committed
Update bzlmod and go deps
1 parent f0fbe96 commit af89e4b

File tree

12 files changed

+8836
-15357
lines changed

12 files changed

+8836
-15357
lines changed

‎.github/workflows/master.yaml

+12-11
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"name": "Gofmt",
28-
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)"
28+
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $(pwd)"
2929
},
3030
{
3131
"name": "Clang format",
@@ -37,11 +37,11 @@
3737
},
3838
{
3939
"name": "Protobuf generation",
40-
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
40+
"run": "if [ -d bazel-bin/pkg/proto ]; then\n find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\n bazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\n find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\n done\nfi\n"
4141
},
4242
{
4343
"name": "Embedded asset generation",
44-
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
44+
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|; s|\"||g; s| .*||' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
4545
},
4646
{
4747
"name": "Test style conformance",
@@ -61,7 +61,7 @@
6161
},
6262
{
6363
"name": "linux_amd64: upload bb_browser",
64-
"uses": "actions/upload-artifact@v2-preview",
64+
"uses": "actions/upload-artifact@v4",
6565
"with": {
6666
"name": "bb_browser.linux_amd64",
6767
"path": "bb_browser"
@@ -77,7 +77,7 @@
7777
},
7878
{
7979
"name": "linux_386: upload bb_browser",
80-
"uses": "actions/upload-artifact@v2-preview",
80+
"uses": "actions/upload-artifact@v4",
8181
"with": {
8282
"name": "bb_browser.linux_386",
8383
"path": "bb_browser"
@@ -93,7 +93,7 @@
9393
},
9494
{
9595
"name": "linux_arm: upload bb_browser",
96-
"uses": "actions/upload-artifact@v2-preview",
96+
"uses": "actions/upload-artifact@v4",
9797
"with": {
9898
"name": "bb_browser.linux_arm",
9999
"path": "bb_browser"
@@ -109,7 +109,7 @@
109109
},
110110
{
111111
"name": "linux_arm64: upload bb_browser",
112-
"uses": "actions/upload-artifact@v2-preview",
112+
"uses": "actions/upload-artifact@v4",
113113
"with": {
114114
"name": "bb_browser.linux_arm64",
115115
"path": "bb_browser"
@@ -125,7 +125,7 @@
125125
},
126126
{
127127
"name": "darwin_amd64: upload bb_browser",
128-
"uses": "actions/upload-artifact@v2-preview",
128+
"uses": "actions/upload-artifact@v4",
129129
"with": {
130130
"name": "bb_browser.darwin_amd64",
131131
"path": "bb_browser"
@@ -141,7 +141,7 @@
141141
},
142142
{
143143
"name": "darwin_arm64: upload bb_browser",
144-
"uses": "actions/upload-artifact@v2-preview",
144+
"uses": "actions/upload-artifact@v4",
145145
"with": {
146146
"name": "bb_browser.darwin_arm64",
147147
"path": "bb_browser"
@@ -157,7 +157,7 @@
157157
},
158158
{
159159
"name": "freebsd_amd64: upload bb_browser",
160-
"uses": "actions/upload-artifact@v2-preview",
160+
"uses": "actions/upload-artifact@v4",
161161
"with": {
162162
"name": "bb_browser.freebsd_amd64",
163163
"path": "bb_browser"
@@ -173,7 +173,7 @@
173173
},
174174
{
175175
"name": "windows_amd64: upload bb_browser",
176-
"uses": "actions/upload-artifact@v2-preview",
176+
"uses": "actions/upload-artifact@v4",
177177
"with": {
178178
"name": "bb_browser.windows_amd64",
179179
"path": "bb_browser.exe"
@@ -197,6 +197,7 @@
197197
"on": {
198198
"push": {
199199
"branches": [
200+
"main",
200201
"master"
201202
]
202203
}

‎.github/workflows/pull-requests.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"name": "Gofmt",
28-
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)"
28+
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $(pwd)"
2929
},
3030
{
3131
"name": "Clang format",
@@ -37,11 +37,11 @@
3737
},
3838
{
3939
"name": "Protobuf generation",
40-
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
40+
"run": "if [ -d bazel-bin/pkg/proto ]; then\n find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\n bazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\n find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\n done\nfi\n"
4141
},
4242
{
4343
"name": "Embedded asset generation",
44-
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
44+
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|; s|\"||g; s| .*||' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
4545
},
4646
{
4747
"name": "Test style conformance",
@@ -90,6 +90,7 @@
9090
"on": {
9191
"pull_request": {
9292
"branches": [
93+
"main",
9394
"master"
9495
]
9596
}

‎BUILD.bazel

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ load("@gazelle//:def.bzl", "gazelle")
33

44
# gazelle:go_naming_convention_external import
55
# gazelle:prefix github.com/buildbarn/bb-browser
6-
# gazelle:resolve proto build/bazel/remote/execution/v2/remote_execution.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/execution/v2:remote_execution_proto
7-
# gazelle:resolve proto go build/bazel/remote/execution/v2/remote_execution.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/execution/v2:execution
6+
# gazelle:resolve go github.com/bazelbuild/remote-apis/build/bazel/remote/execution/v2 @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_go_proto
7+
# gazelle:resolve go github.com/bazelbuild/remote-apis/build/bazel/semver @bazel_remote_apis//build/bazel/semver:semver_go_proto
8+
# gazelle:resolve proto build/bazel/remote/execution/v2/remote_execution.proto @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_proto
9+
# gazelle:resolve proto go build/bazel/remote/execution/v2/remote_execution.proto @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_go_proto
810
# gazelle:resolve proto pkg/proto/configuration/auth/auth.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/auth:auth_proto
911
# gazelle:resolve proto go pkg/proto/configuration/auth/auth.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/auth
1012
# gazelle:resolve proto pkg/proto/configuration/blobstore/blobstore.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/blobstore:blobstore_proto

‎MODULE.bazel

+17-32
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
module(name = "com_github_buildbarn_bb_browser")
22

3-
bazel_dep(name = "aspect_rules_js", version = "1.39.1")
3+
bazel_dep(name = "aspect_rules_js", version = "2.0.1")
4+
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
45
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
56
bazel_dep(name = "com_github_buildbarn_bb_storage")
67
bazel_dep(name = "com_github_buildbarn_go_xdr")
7-
bazel_dep(name = "gazelle", version = "0.35.0")
8-
bazel_dep(name = "protobuf", version = "23.1")
9-
bazel_dep(name = "rules_go", version = "0.46.0")
10-
bazel_dep(name = "rules_jsonnet", version = "0.5.0")
11-
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")
12-
bazel_dep(name = "toolchains_llvm", version = "1.0.0")
8+
bazel_dep(name = "gazelle", version = "0.38.0")
9+
bazel_dep(name = "protobuf", version = "28.1")
10+
bazel_dep(name = "rules_go", version = "0.50.1")
11+
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
12+
bazel_dep(name = "rules_proto", version = "6.0.2")
13+
bazel_dep(name = "toolchains_llvm", version = "1.1.2")
14+
15+
git_override(
16+
module_name = "bazel_remote_apis",
17+
commit = "6777112ef7defa6705b1ebd2831d6c7efeb12ba2",
18+
remote = "https://github.com/bazelbuild/remote-apis.git",
19+
)
1320

1421
git_override(
1522
module_name = "com_github_buildbarn_bb_remote_execution",
16-
commit = "ea22f37f62b885026ad9e1aa0d62deb15dbb454a",
23+
commit = "853626adcafd25a948f90b05a251bfba9a0e236f",
1724
remote = "https://github.com/buildbarn/bb-remote-execution.git",
1825
)
1926

2027
git_override(
2128
module_name = "com_github_buildbarn_bb_storage",
22-
commit = "118cb9ca2a7df1cbac6d51c7f1cc3156cae06446",
29+
commit = "8abbcfab01bcde294b20c2070baba9fd242bab7f",
2330
remote = "https://github.com/buildbarn/bb-storage.git",
2431
)
2532

2633
git_override(
2734
module_name = "com_github_buildbarn_go_xdr",
28-
commit = "9cb8426d3e09e301c2b12c993e54ef795a665a92",
35+
commit = "236788cf9e8948a1e8875c7dd243e2be180cdfd7",
2936
remote = "https://github.com/buildbarn/go-xdr.git",
3037
)
3138

32-
git_override(
33-
module_name = "gazelle",
34-
commit = "f5a5c5dc90b4d6a39f0f47d770eba27c6c1c1877",
35-
patches = ["//:patches/gazelle/googleapis.diff"],
36-
remote = "https://github.com/bazelbuild/bazel-gazelle.git",
37-
)
38-
3939
git_override(
4040
module_name = "rules_antlr",
4141
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
@@ -52,7 +52,6 @@ use_repo(
5252
go_deps,
5353
"cc_mvdan_gofumpt",
5454
"com_github_bazelbuild_buildtools",
55-
"com_github_bazelbuild_remote_apis",
5655
"com_github_buildkite_terminal_to_html",
5756
"com_github_dustin_go_humanize",
5857
"com_github_gorilla_mux",
@@ -65,20 +64,6 @@ use_repo(
6564
)
6665

6766
go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
68-
go_deps_dev.gazelle_override(
69-
build_file_generation = "on",
70-
directives = [
71-
"gazelle:go_grpc_compilers @io_bazel_rules_go//proto:go_proto,@io_bazel_rules_go//proto:go_grpc_v2",
72-
"gazelle:resolve proto go build/bazel/semver/semver.proto //build/bazel/semver",
73-
"gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto_googleapis_api//annotations",
74-
"gazelle:resolve proto go google/longrunning/operations.proto @com_google_cloud_go_longrunning//autogen/longrunningpb",
75-
"gazelle:resolve proto go google/rpc/status.proto @org_golang_google_genproto_googleapis_rpc//status",
76-
"gazelle:resolve proto google/api/annotations.proto @googleapis//google/api:annotations_proto",
77-
"gazelle:resolve proto google/longrunning/operations.proto @googleapis//google/longrunning:operations_proto",
78-
"gazelle:resolve proto google/rpc/status.proto @googleapis//google/rpc:status_proto",
79-
],
80-
path = "github.com/bazelbuild/remote-apis",
81-
)
8267
go_deps_dev.module_override(
8368
patches = ["//:patches/com_github_buildkite_terminal_to_html/assets.diff"],
8469
path = "github.com/buildkite/terminal-to-html",

0 commit comments

Comments
 (0)