Skip to content

Commit

Permalink
Upgrade all Go dependencies
Browse files Browse the repository at this point in the history
This requires us to catch up with various changes to the path parsing
and virtual file system APIs.
  • Loading branch information
EdSchouten committed Sep 19, 2024
1 parent ac37453 commit 8288a81
Show file tree
Hide file tree
Showing 28 changed files with 3,785 additions and 482 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
{
"name": "linux_amd64: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.linux_amd64",
"path": "bb_clientd"
Expand All @@ -77,7 +77,7 @@
},
{
"name": "linux_386: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.linux_386",
"path": "bb_clientd"
Expand All @@ -93,7 +93,7 @@
},
{
"name": "linux_arm: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.linux_arm",
"path": "bb_clientd"
Expand All @@ -109,7 +109,7 @@
},
{
"name": "linux_arm64: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.linux_arm64",
"path": "bb_clientd"
Expand All @@ -125,7 +125,7 @@
},
{
"name": "darwin_amd64: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.darwin_amd64",
"path": "bb_clientd"
Expand All @@ -141,7 +141,7 @@
},
{
"name": "darwin_arm64: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.darwin_arm64",
"path": "bb_clientd"
Expand All @@ -157,7 +157,7 @@
},
{
"name": "freebsd_amd64: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.freebsd_amd64",
"path": "bb_clientd"
Expand All @@ -173,7 +173,7 @@
},
{
"name": "windows_amd64: upload bb_clientd",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_clientd.windows_amd64",
"path": "bb_clientd.exe"
Expand Down
1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ load("@rules_pkg//:pkg.bzl", "pkg_deb", "pkg_tar")

# gazelle:go_naming_convention_external import
# gazelle:prefix github.com/buildbarn/bb-clientd
# 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
# gazelle:resolve proto go pkg/proto/configuration/blobstore/blobstore.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/blobstore
# gazelle:resolve proto go pkg/proto/configuration/builder/builder.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/builder
# gazelle:resolve proto go pkg/proto/configuration/cas/cas.proto @com_github_buildbarn_bb_remote_execution//pkg/proto/configuration/cas
Expand Down
33 changes: 9 additions & 24 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module(name = "com_github_buildbarn_bb_clientd")

bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
bazel_dep(name = "com_github_buildbarn_bb_storage")
bazel_dep(name = "com_github_buildbarn_go_xdr")
Expand All @@ -11,15 +12,21 @@ bazel_dep(name = "rules_go", version = "0.48.1")
bazel_dep(name = "rules_pkg", version = "0.10.1")
bazel_dep(name = "toolchains_llvm", version = "1.0.0")

git_override(
module_name = "bazel_remote_apis",
commit = "de1d77b12feb81f96909f0410991c3c966d9d8e7",
remote = "https://github.com/bazelbuild/remote-apis.git",
)

git_override(
module_name = "com_github_buildbarn_bb_remote_execution",
commit = "a3a263e81ef01aa13b1a9ad5573cc81f928dd33e",
commit = "bf32d1897971edde42a59636c8103b09a72196ae",
remote = "https://github.com/buildbarn/bb-remote-execution.git",
)

git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "a869915feea7333a85e92e7a9f7a4821969408d6",
commit = "256ec6c483a05f1aeefff6fc57a2044f746c5a08",
remote = "https://github.com/buildbarn/bb-storage.git",
)

Expand All @@ -29,13 +36,6 @@ git_override(
remote = "https://github.com/buildbarn/go-xdr.git",
)

git_override(
module_name = "gazelle",
commit = "4d0129d7adae33e8e648d3624aff8fa8f93f375b",
patches = ["//:patches/gazelle/googleapis.diff"],
remote = "https://github.com/bazelbuild/bazel-gazelle.git",
)

git_override(
module_name = "rules_antlr",
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
Expand All @@ -52,7 +52,6 @@ use_repo(
go_deps,
"cc_mvdan_gofumpt",
"com_github_bazelbuild_buildtools",
"com_github_bazelbuild_remote_apis",
"com_github_stretchr_testify",
"org_golang_google_genproto_googleapis_bytestream",
"org_golang_google_grpc",
Expand All @@ -63,20 +62,6 @@ use_repo(
)

go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
go_deps_dev.gazelle_override(
build_file_generation = "on",
directives = [
"gazelle:go_grpc_compilers @io_bazel_rules_go//proto:go_proto,@io_bazel_rules_go//proto:go_grpc_v2",
"gazelle:resolve proto go build/bazel/semver/semver.proto //build/bazel/semver",
"gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto_googleapis_api//annotations",
"gazelle:resolve proto go google/longrunning/operations.proto @com_google_cloud_go_longrunning//autogen/longrunningpb",
"gazelle:resolve proto go google/rpc/status.proto @org_golang_google_genproto_googleapis_rpc//status",
"gazelle:resolve proto google/api/annotations.proto @googleapis//google/api:annotations_proto",
"gazelle:resolve proto google/longrunning/operations.proto @googleapis//google/longrunning:operations_proto",
"gazelle:resolve proto google/rpc/status.proto @googleapis//google/rpc:status_proto",
],
path = "github.com/bazelbuild/remote-apis",
)
go_deps_dev.module_override(
patches = ["@com_github_buildbarn_bb_storage//:patches/com_github_grpc_ecosystem_go_grpc_prometheus/client-metrics-prevent-handled-twice.diff"],
path = "github.com/grpc-ecosystem/go-grpc-prometheus",
Expand Down
Loading

0 comments on commit 8288a81

Please sign in to comment.