Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
- Use latest bb-storage version, this required switching to using
  remote_apis as a bazel module.
- Update the upload-artifact actions to v4
- Use rules_jsonnet bazel module
- Update rules_go, protobuf and gazelle bazel modules
  • Loading branch information
sdclarke committed Sep 11, 2024
1 parent 965d95e commit 9624fd1
Show file tree
Hide file tree
Showing 19 changed files with 2,297 additions and 12,754 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
{
"name": "Gofmt",
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)"
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $(pwd)"
},
{
"name": "Clang format",
Expand Down Expand Up @@ -61,7 +61,7 @@
},
{
"name": "linux_amd64: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.linux_amd64",
"path": "bb_remote_asset"
Expand All @@ -77,7 +77,7 @@
},
{
"name": "linux_386: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.linux_386",
"path": "bb_remote_asset"
Expand All @@ -93,7 +93,7 @@
},
{
"name": "linux_arm: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.linux_arm",
"path": "bb_remote_asset"
Expand All @@ -109,7 +109,7 @@
},
{
"name": "linux_arm64: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.linux_arm64",
"path": "bb_remote_asset"
Expand All @@ -125,7 +125,7 @@
},
{
"name": "darwin_amd64: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.darwin_amd64",
"path": "bb_remote_asset"
Expand All @@ -141,7 +141,7 @@
},
{
"name": "darwin_arm64: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.darwin_arm64",
"path": "bb_remote_asset"
Expand All @@ -157,7 +157,7 @@
},
{
"name": "freebsd_amd64: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.freebsd_amd64",
"path": "bb_remote_asset"
Expand All @@ -173,7 +173,7 @@
},
{
"name": "windows_amd64: upload bb_remote_asset",
"uses": "actions/upload-artifact@v2-preview",
"uses": "actions/upload-artifact@v4",
"with": {
"name": "bb_remote_asset.windows_amd64",
"path": "bb_remote_asset.exe"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-requests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
{
"name": "Gofmt",
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)"
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $(pwd)"
},
{
"name": "Clang format",
Expand Down
10 changes: 6 additions & 4 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ load("@gazelle//:def.bzl", "gazelle")

# gazelle:go_naming_convention_external import
# gazelle:prefix github.com/buildbarn/bb-remote-asset
# gazelle:resolve proto build/bazel/remote/asset/v1/remote_asset.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/asset/v1:remote_asset_proto
# gazelle:resolve proto build/bazel/remote/execution/v2/remote_execution.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/execution/v2:remote_execution_proto
# gazelle:resolve proto go build/bazel/remote/asset/v1/remote_asset.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/asset/v1:asset
# gazelle:resolve proto go build/bazel/remote/execution/v2/remote_execution.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/execution/v2:execution
# gazelle:resolve proto build/bazel/remote/asset/v1/remote_asset.proto @bazel_remote_apis//build/bazel/remote/asset/v1:remote_asset_proto
# gazelle:resolve proto build/bazel/remote/execution/v2/remote_execution.proto @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_proto
# gazelle:resolve proto go build/bazel/remote/asset/v1/remote_asset.proto @bazel_remote_apis//build/bazel/remote/asset/v1:remote_asset_go_proto
# gazelle:resolve proto go build/bazel/remote/execution/v2/remote_execution.proto @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_go_proto
# 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 go github.com/bazelbuild/remote-apis/build/bazel/remote/asset/v1 @bazel_remote_apis//build/bazel/remote/asset/v1:remote_asset_go_proto
# gazelle:resolve proto go google/bytestream/bytestream.proto @org_golang_google_genproto_googleapis_bytestream//:bytestream
# gazelle:resolve proto go google/rpc/status.proto @org_golang_google_genproto_googleapis_rpc//status
# gazelle:resolve proto go opentelemetry/proto/common/v1/common.proto @io_opentelemetry_go_proto_otlp//common/v1:common
Expand Down
31 changes: 18 additions & 13 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
module(name = "com_github_buildbarn_bb_remote_asset")

bazel_dep(name = "com_github_buildbarn_bb_storage")
bazel_dep(name = "gazelle", version = "0.35.0")
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
bazel_dep(name = "gazelle", version = "0.38.0")
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5")
bazel_dep(name = "jsonnet_go", version = "0.20.0", repo_name = "google_jsonnet_go")
bazel_dep(name = "protobuf", version = "23.1")
bazel_dep(name = "rules_go", version = "0.46.0")
bazel_dep(name = "protobuf", version = "27.3")
bazel_dep(name = "rules_go", version = "0.50.0")
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
bazel_dep(name = "rules_proto", version = "6.0.2")
bazel_dep(name = "toolchains_llvm", version = "1.0.0")

git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "914e53aad8cd16fc4c1ecd7f706149e8440ea24a",
commit = "a889bc06a4070e34f5b7d85073dabaa37bfc3027",
remote = "https://github.com/buildbarn/bb-storage.git",
)

git_override(
module_name = "bazel_remote_apis",
commit = "9a250a0f817fe63a426ede43b133c3dc4549d75f",
patches = ["//:patches/bazel_remote_apis/grpc-v2.diff"],
remote = "https://github.com/bazelbuild/remote-apis.git",
)

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

Expand Down Expand Up @@ -60,13 +72,6 @@ go_deps_dev.module_override(

http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_bazel_rules_jsonnet",
sha256 = "c51ba0dba41d667fa5c64e56e252ba54be093e5ae764af6470dabca901f373eb",
strip_prefix = "rules_jsonnet-0.5.0",
urls = ["https://github.com/bazelbuild/rules_jsonnet/archive/0.5.0.tar.gz"],
)

llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True)
llvm.toolchain(
llvm_version = "14.0.0",
Expand Down
Loading

0 comments on commit 9624fd1

Please sign in to comment.