Skip to content

Update dependencies, buildbarn ecosystem to latest #29

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.

Sign up for GitHub

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

Merged
minor-fixes merged 17 commits into from
Sep 10, 2023
Merged

Update dependencies, buildbarn ecosystem to latest #29

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aad1fde
Update rules_docker, rules_jsonnet
minor-fixes Apr 2, 2023
224d22e
Update rules_go, gazelle, protobuf, gomock
minor-fixes Apr 5, 2023
826d098
The rest of the updating owl
minor-fixes Apr 6, 2023
42bad2e
Build fixes pt. 1
minor-fixes Apr 10, 2023
365be4d
Build fixes pt. 2
minor-fixes Apr 11, 2023
88a5132
Build fixes pt. 3
minor-fixes Apr 11, 2023
a286082
Return errors (duh)
minor-fixes May 9, 2023
268b722
Update bb-storage to pick up modified patch
minor-fixes May 10, 2023
d2f1102
Add bazel.canonical_id to list of supported qualifiers
minor-fixes May 10, 2023
96553d1
Update Github workflows, format README
minor-fixes May 10, 2023
fb32c51
Fix gazelle target mappings for bb-storage
minor-fixes May 10, 2023
8b6f899
Run gofumpt
minor-fixes May 10, 2023
461fae9
Removed newlines from go_dependencies.bzl
minor-fixes May 10, 2023
4c0d945
go: Update dependencies to latest
minor-fixes Jun 19, 2023
bc43c92
Pruned dependencies
minor-fixes Jun 19, 2023
f3c9583
Style fixes
minor-fixes Sep 10, 2023
0026780
Fix up README, proto pointer field refs
minor-fixes Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
load("@bazel_gazelle//:def.bzl", "gazelle")
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
load("@npm//:defs.bzl", "npm_link_all_packages")

# gazelle:prefix github.com/buildbarn/bb-remote-asset
# 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/execution/v2/remote_execution.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/execution/v2:go_default_library
# 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 @com_github_bazelbuild_remote_apis//build/bazel/remote/asset/v1:remote_asset_proto
# gazelle:resolve proto go build/bazel/remote/asset/v1/remote_asset.proto @com_github_bazelbuild_remote_apis//build/bazel/remote/asset/v1:go_default_library
# gazelle:resolve proto pkg/proto/configuration/blobstore/blobstore.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/blobstore:blobstore_proto
Expand All @@ -12,10 +13,16 @@ load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
# gazelle:resolve proto go pkg/proto/configuration/global/global.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/global:go_default_library
# gazelle:resolve proto pkg/proto/configuration/grpc/grpc.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/grpc:grpc_proto
# gazelle:resolve proto go pkg/proto/configuration/grpc/grpc.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/grpc:go_default_library
# gazelle:resolve proto opentelemetry/proto/common/v1/common.proto @io_opentelemetry_proto//:common_proto
# gazelle:resolve proto go opentelemetry/proto/common/v1/common.proto @io_opentelemetry_go_proto_otlp//common/v1:common
gazelle(
name = "gazelle",
)

buildifier(
name = "buildifier",
)

npm_link_all_packages(
name = "node_modules",
)
140 changes: 92 additions & 48 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,46 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "bazel_gomock",
sha256 = "5c4e7cde43a80d7bdef8cd3ff0741e33b24f9e2897ae9759bfe0ff2ba80125db",
strip_prefix = "bazel_gomock-1.1",
urls = ["https://github.com/jmhodges/bazel_gomock/archive/v1.1.tar.gz"],
)

http_archive(
name = "bazel_toolchains",
sha256 = "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330",
strip_prefix = "bazel-toolchains-0.27.1",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz",
],
sha256 = "2da16771642ce7f75a8d620a1029b83ee29b206c6665bb8c92f003b427e35dbf",
strip_prefix = "bazel_gomock-4f2ee840432b1a08ccc46ee4f2c1f5a2bad8fade",
urls = ["https://github.com/jmhodges/bazel_gomock/archive/4f2ee840432b1a08ccc46ee4f2c1f5a2bad8fade.tar.gz"],
)

http_archive(
name = "io_bazel_rules_docker",
sha256 = "4521794f0fba2e20f3bf15846ab5e01d5332e587e9ce81629c7f96c793bb7036",
strip_prefix = "rules_docker-0.14.4",
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.14.4/rules_docker-v0.14.4.tar.gz"],
sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz"],
)

http_archive(
name = "io_bazel_rules_go",
sha256 = "142dd33e38b563605f0d20e89d9ef9eda0fc3cb539a14be1bdb1350de2eda659",
sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.2/rules_go-v0.22.2.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.22.2/rules_go-v0.22.2.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
],
)

http_archive(
name = "bazel_gazelle",
sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10",
sha256 = "ecba0f04f96b4960a5b250c8e8eeec42281035970aa8852dda73098274d14a1d",
urls = [
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz",
],
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains()

# gazelle:repository_macro go_dependencies.bzl%go_dependencies
load("//:go_dependencies.bzl", "go_dependencies")

go_dependencies()

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains(version = "1.20.1")

load(
"@io_bazel_rules_docker//repositories:repositories.bzl",
container_repositories = "repositories",
Expand All @@ -66,10 +55,6 @@ load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps")

container_deps()

load("@io_bazel_rules_docker//repositories:pip_repositories.bzl", container_pip_deps = "pip_deps")

container_pip_deps()

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

gazelle_dependencies()
Expand All @@ -78,6 +63,17 @@ load("@io_bazel_rules_docker//go:image.bzl", _go_image_repos = "repositories")

_go_image_repos()

http_archive(
name = "com_github_bazelbuild_buildtools",
sha256 = "09a94213ea0d4a844e991374511fb0d44650e9c321799ec5d5dd28b250d82ca3",
strip_prefix = "buildtools-5.0.0",
url = "https://github.com/bazelbuild/buildtools/archive/5.0.0.tar.gz",
)

load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")

buildifier_dependencies()

load("@com_github_bazelbuild_remote_apis//:repository_rules.bzl", "switched_rules_by_language")

switched_rules_by_language(
Expand All @@ -87,9 +83,9 @@ switched_rules_by_language(

http_archive(
name = "com_google_protobuf",
sha256 = "761bfffc7d53cd01514fa237ca0d3aba5a3cfd8832a71808c0ccc447174fd0da",
strip_prefix = "protobuf-3.11.1",
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.11.1/protobuf-all-3.11.1.tar.gz"],
sha256 = "ba0650be1b169d24908eeddbe6107f011d8df0da5b1a5a4449a913b10e578faf",
strip_prefix = "protobuf-3.19.4",
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protobuf-all-3.19.4.tar.gz"],
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
Expand All @@ -98,38 +94,35 @@ protobuf_deps()

http_archive(
name = "com_grail_bazel_toolchain",
sha256 = "b3dec631fe2be45b3a7a8a4161dd07fadc68825842e8d6305ed35bc8560968ca",
strip_prefix = "bazel-toolchain-0.5.1",
urls = ["https://github.com/grailbio/bazel-toolchain/archive/0.5.1.tar.gz"],
canonical_id = "0.7.2",
sha256 = "f7aa8e59c9d3cafde6edb372d9bd25fb4ee7293ab20b916d867cd0baaa642529",
strip_prefix = "bazel-toolchain-0.7.2",
url = "https://github.com/grailbio/bazel-toolchain/archive/0.7.2.tar.gz",
)

load("@com_grail_bazel_toolchain//toolchain:rules.bzl", "llvm_toolchain")

llvm_toolchain(
name = "llvm_toolchain",
llvm_version = "9.0.0",
llvm_version = "14.0.0",
)

load("@io_bazel_rules_go//extras:embed_data_deps.bzl", "go_embed_data_dependencies")

go_embed_data_dependencies()

http_archive(
name = "io_bazel_rules_jsonnet",
sha256 = "7f51f859035cd98bcf4f70dedaeaca47fe9fbae6b199882c516d67df416505da",
strip_prefix = "rules_jsonnet-0.3.0",
urls = ["https://github.com/bazelbuild/rules_jsonnet/archive/0.3.0.tar.gz"],
sha256 = "d20270872ba8d4c108edecc9581e2bb7f320afab71f8caa2f6394b5202e8a2c3",
strip_prefix = "rules_jsonnet-0.4.0",
urls = ["https://github.com/bazelbuild/rules_jsonnet/archive/0.4.0.tar.gz"],
)

load("@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_repositories")

jsonnet_repositories()

load("@jsonnet_go//bazel:repositories.bzl", "jsonnet_go_repositories")
load("@google_jsonnet_go//bazel:repositories.bzl", "jsonnet_go_repositories")

jsonnet_go_repositories()

load("@jsonnet_go//bazel:deps.bzl", "jsonnet_go_dependencies")
load("@google_jsonnet_go//bazel:deps.bzl", "jsonnet_go_dependencies")

jsonnet_go_dependencies()

Expand All @@ -141,3 +134,54 @@ http_archive(
strip_prefix = "googleapis-143084a2624b6591ee1f9d23e7f5241856642f4d",
urls = ["https://github.com/googleapis/googleapis/archive/143084a2624b6591ee1f9d23e7f5241856642f4d.zip"],
)

@minor-fixes minor-fixes Apr 6, 2023 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@googleapis is extra over bb-storage's WORKSPACE; AFAICT this is because @googleapis is required for remote-apis but bb-storage patches remote-apis to use @go_googleapis instead sufficiently for its usecase (but not sufficiently for the remote asset proto).

Either the patch to remote-apis needs to be reworked to cover more of the protos, or maybe remote-apis can be fixed in a way that doesn't necessitate the patch, but having this here doesn't seem to be causing build issues yet.


http_archive(
name = "com_github_twbs_bootstrap",
build_file_content = """exports_files(["css/bootstrap.min.css", "js/bootstrap.min.js"])""",
sha256 = "395342b2974e3350560e65752d36aab6573652b11cc6cb5ef79a2e5e83ad64b1",
strip_prefix = "bootstrap-5.1.0-dist",
urls = ["https://github.com/twbs/bootstrap/releases/download/v5.1.0/bootstrap-5.1.0-dist.zip"],
)

http_archive(
name = "aspect_rules_js",
sha256 = "00e7b97b696af63812df0ca9e9dbd18579f3edd3ab9a56f227238b8405e4051c",
strip_prefix = "rules_js-1.23.0",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.23.0/rules_js-v1.23.0.tar.gz",
)

load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")

rules_js_dependencies()

load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")

nodejs_register_toolchains(
name = "nodejs",
node_version = DEFAULT_NODE_VERSION,
)

load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")

npm_translate_lock(
name = "npm",
pnpm_lock = "//:pnpm-lock.yaml",
)

load("@npm//:repositories.bzl", "npm_repositories")

npm_repositories()

http_archive(
name = "io_opentelemetry_proto",
build_file_content = """
proto_library(
name = "common_proto",
srcs = ["opentelemetry/proto/common/v1/common.proto"],
visibility = ["//visibility:public"],
)
""",
sha256 = "464bc2b348e674a1a03142e403cbccb01be8655b6de0f8bfe733ea31fcd421be",
strip_prefix = "opentelemetry-proto-0.19.0",
urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v0.19.0.tar.gz"],
)
24 changes: 12 additions & 12 deletions cmd/bb_remote_asset/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@ load("@io_bazel_rules_docker//go:image.bzl", "go_image")
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")

go_library(
name = "go_default_library",
name = "bb_remote_asset_lib",
srcs = ["main.go"],
importpath = "github.com/buildbarn/bb-remote-asset/cmd/bb_remote_asset",
visibility = ["//visibility:private"],
deps = [
"//pkg/configuration:go_default_library",
"//pkg/fetch:go_default_library",
"//pkg/proto/configuration/bb_remote_asset:go_default_library",
"//pkg/push:go_default_library",
"//pkg/configuration",
"//pkg/fetch",
"//pkg/proto/configuration/bb_remote_asset",
"//pkg/push",
"@com_github_bazelbuild_remote_apis//build/bazel/remote/asset/v1:go_default_library",
"@com_github_buildbarn_bb_storage//pkg/clock:go_default_library",
"@com_github_buildbarn_bb_storage//pkg/digest:go_default_library",
"@com_github_buildbarn_bb_storage//pkg/global:go_default_library",
"@com_github_buildbarn_bb_storage//pkg/grpc:go_default_library",
"@com_github_buildbarn_bb_storage//pkg/util:go_default_library",
"@com_github_buildbarn_bb_storage//pkg/clock",
"@com_github_buildbarn_bb_storage//pkg/digest",
"@com_github_buildbarn_bb_storage//pkg/global",
"@com_github_buildbarn_bb_storage//pkg/grpc",
"@com_github_buildbarn_bb_storage//pkg/util",
"@org_golang_google_grpc//:go_default_library",
],
)

go_binary(
name = "bb_remote_asset",
embed = [":go_default_library"],
embed = [":bb_remote_asset_lib"],
pure = "on",
visibility = ["//visibility:public"],
)

go_image(
name = "bb_remote_asset_container",
embed = [":go_default_library"],
embed = [":bb_remote_asset_lib"],
pure = "on",
visibility = ["//visibility:public"],
)
Expand Down
Loading