From ea22f37f62b885026ad9e1aa0d62deb15dbb454a Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Mon, 1 Apr 2024 15:07:06 +0200 Subject: [PATCH] Use rules_jsonnet from BCR This allows us to drop the direct dependency on jsonnet_go entirely. Only bb-storage has a direct code dependency on it. --- MODULE.bazel | 11 +- MODULE.bazel.lock | 352 ++++++++++++++--------------- go.mod | 2 +- go.sum | 28 +-- tools/github_workflows/BUILD.bazel | 2 +- 5 files changed, 180 insertions(+), 215 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2e11a893..9fa4e35d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,9 +6,9 @@ bazel_dep(name = "com_github_buildbarn_bb_storage") bazel_dep(name = "com_github_buildbarn_go_xdr") bazel_dep(name = "gazelle", version = "0.35.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 = "rules_jsonnet", version = "0.5.0") bazel_dep(name = "rules_oci", version = "1.7.5") bazel_dep(name = "rules_pkg", version = "0.10.1") bazel_dep(name = "rules_proto", version = "6.0.0-rc2") @@ -16,7 +16,7 @@ bazel_dep(name = "toolchains_llvm", version = "1.0.0") git_override( module_name = "com_github_buildbarn_bb_storage", - commit = "914e53aad8cd16fc4c1ecd7f706149e8440ea24a", + commit = "dee7e428a0bd962b192512aad8f3ff76dcc0f437", remote = "https://github.com/buildbarn/bb-storage.git", ) @@ -130,13 +130,6 @@ http_archive( urls = ["https://github.com/twbs/bootstrap/releases/download/v5.1.0/bootstrap-5.1.0-dist.zip"], ) -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"], -) - http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") http_file( diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 936a7aeb..d73917df 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 6, - "moduleFileHash": "7d230dd69ef28a29a03236deebf5a0655741050d8566e12b298160cf29906aaf", + "moduleFileHash": "f5095f66ccc26248eaa6fd656e2565ec22b0d1c688eacb59bd27f176a8e47d1a", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -172,7 +172,6 @@ }, "imports": { "com_github_twbs_bootstrap": "com_github_twbs_bootstrap", - "io_bazel_rules_jsonnet": "io_bazel_rules_jsonnet", "com_github_krallin_tini_tini_static_amd64": "com_github_krallin_tini_tini_static_amd64", "com_github_krallin_tini_tini_static_arm64": "com_github_krallin_tini_tini_static_arm64" }, @@ -196,23 +195,6 @@ "column": 13 } }, - { - "tagName": "@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributeValues": { - "sha256": "c51ba0dba41d667fa5c64e56e252ba54be093e5ae764af6470dabca901f373eb", - "strip_prefix": "rules_jsonnet-0.5.0", - "urls": [ - "https://github.com/bazelbuild/rules_jsonnet/archive/0.5.0.tar.gz" - ], - "name": "io_bazel_rules_jsonnet" - }, - "devDependency": false, - "location": { - "file": "@@//:MODULE.bazel", - "line": 133, - "column": 13 - } - }, { "tagName": "@bazel_tools//tools/build_defs/repo:http.bzl%http_file", "attributeValues": { @@ -227,7 +209,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 142, + "line": 135, "column": 10 } }, @@ -245,7 +227,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 150, + "line": 143, "column": 10 } } @@ -259,7 +241,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 158, + "line": 151, "column": 21 }, "imports": { @@ -277,7 +259,7 @@ "devDependency": true, "location": { "file": "@@//:MODULE.bazel", - "line": 159, + "line": 152, "column": 15 } } @@ -291,7 +273,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 164, + "line": 157, "column": 20 }, "imports": { @@ -309,7 +291,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 165, + "line": 158, "column": 23 } } @@ -323,7 +305,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 172, + "line": 165, "column": 20 }, "imports": { @@ -345,7 +327,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 173, + "line": 166, "column": 9 } } @@ -361,9 +343,9 @@ "com_github_buildbarn_go_xdr": "com_github_buildbarn_go_xdr@_", "gazelle": "gazelle@_", "googleapis": "googleapis@0.0.0-20240326-1c8d509c5", - "google_jsonnet_go": "jsonnet_go@0.20.0", "protobuf": "protobuf@23.1", "rules_go": "rules_go@_", + "rules_jsonnet": "rules_jsonnet@0.5.0", "rules_oci": "rules_oci@1.7.5", "rules_pkg": "rules_pkg@0.10.1", "rules_proto": "rules_proto@6.0.0-rc2", @@ -651,7 +633,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 27, + "line": 28, "column": 23 }, "imports": {}, @@ -665,7 +647,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 28, + "line": 29, "column": 16 } } @@ -679,7 +661,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 30, + "line": 31, "column": 24 }, "imports": { @@ -737,7 +719,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 31, + "line": 32, "column": 18 } } @@ -755,8 +737,7 @@ "column": 0 }, "imports": { - "com_github_twbs_bootstrap": "com_github_twbs_bootstrap", - "io_bazel_rules_jsonnet": "io_bazel_rules_jsonnet" + "com_github_twbs_bootstrap": "com_github_twbs_bootstrap" }, "devImports": [], "tags": [ @@ -774,24 +755,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 117, - "column": 13 - } - }, - { - "tagName": "@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributeValues": { - "sha256": "c51ba0dba41d667fa5c64e56e252ba54be093e5ae764af6470dabca901f373eb", - "strip_prefix": "rules_jsonnet-0.5.0", - "urls": [ - "https://github.com/bazelbuild/rules_jsonnet/archive/0.5.0.tar.gz" - ], - "name": "io_bazel_rules_jsonnet" - }, - "devDependency": false, - "location": { - "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 125, + "line": 118, "column": 13 } } @@ -805,7 +769,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 138, + "line": 132, "column": 20 }, "imports": { @@ -823,7 +787,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 139, + "line": 133, "column": 23 } } @@ -837,7 +801,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 146, + "line": 140, "column": 20 }, "imports": { @@ -859,7 +823,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 147, + "line": 141, "column": 9 } } @@ -873,10 +837,11 @@ "aspect_rules_js": "aspect_rules_js@1.39.1", "gazelle": "gazelle@_", "googleapis": "googleapis@0.0.0-20240326-1c8d509c5", - "google_jsonnet_go": "jsonnet_go@0.20.0", + "jsonnet_go": "jsonnet_go@0.20.0", "opentelemetry-proto": "opentelemetry-proto@1.1.0", "protobuf": "protobuf@23.1", "rules_go": "rules_go@_", + "rules_jsonnet": "rules_jsonnet@0.5.0", "rules_oci": "rules_oci@1.7.5", "rules_pkg": "rules_pkg@0.10.1", "rules_proto": "rules_proto@6.0.0-rc2", @@ -1172,70 +1137,6 @@ } } }, - "jsonnet_go@0.20.0": { - "name": "jsonnet_go", - "version": "0.20.0", - "key": "jsonnet_go@0.20.0", - "repoName": "jsonnet_go", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [], - "extensionUsages": [ - { - "extensionBzlFile": "@bazel_gazelle//:extensions.bzl", - "extensionName": "go_deps", - "usingModule": "jsonnet_go@0.20.0", - "location": { - "file": "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/MODULE.bazel", - "line": 7, - "column": 24 - }, - "imports": { - "com_github_fatih_color": "com_github_fatih_color", - "com_github_sergi_go_diff": "com_github_sergi_go_diff", - "io_k8s_sigs_yaml": "io_k8s_sigs_yaml" - }, - "devImports": [], - "tags": [ - { - "tagName": "from_file", - "attributeValues": { - "go_mod": "@jsonnet_go//:go.mod" - }, - "devDependency": false, - "location": { - "file": "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/MODULE.bazel", - "line": 8, - "column": 18 - } - } - ], - "hasDevUseExtension": false, - "hasNonDevUseExtension": true - } - ], - "deps": { - "bazel_gazelle": "gazelle@_", - "cpp_jsonnet": "jsonnet@0.20.0", - "io_bazel_rules_go": "rules_go@_", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/google/go-jsonnet/archive/refs/tags/v0.20.0.zip" - ], - "integrity": "sha256-EZ9sbQ3D/JrhR3GoerP+X6dOQOPj207dv0yjh5Z453c=", - "strip_prefix": "go-jsonnet-0.20.0", - "remote_patches": { - "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/patches/module_dot_bazel.patch": "sha256-7/AtC31dhw3fhB7N8XIId8R5ZkJ80Y1k6BVne8xt3eo=" - }, - "remote_patch_strip": 0 - } - } - }, "protobuf@23.1": { "name": "protobuf", "version": "23.1", @@ -1433,6 +1334,37 @@ "local_config_platform": "local_config_platform@_" } }, + "rules_jsonnet@0.5.0": { + "name": "rules_jsonnet", + "version": "0.5.0", + "key": "rules_jsonnet@0.5.0", + "repoName": "io_bazel_rules_jsonnet", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "jsonnet": "jsonnet@0.20.0", + "google_jsonnet_go": "jsonnet_go@0.20.0", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/bazelbuild/rules_jsonnet/archive/refs/tags/0.5.0.tar.gz" + ], + "integrity": "sha256-xRug26QdZn+lxk5W4lK6VL4JPlrnZK9kcNq8qQHzc+s=", + "strip_prefix": "rules_jsonnet-0.5.0", + "remote_patches": { + "https://bcr.bazel.build/modules/rules_jsonnet/0.5.0/patches/add_module_dot_bazel.patch": "sha256-qkrjrjVpcuo+ykWoNtrUr6yZDbTcMJC+48/rgeAVfNM=", + "https://bcr.bazel.build/modules/rules_jsonnet/0.5.0/patches/add_examples_module_dot_bazel.patch": "sha256-AikVRYmO8oFBEnvZCO1Dk0Er7KYhMDl2b3Zo+M9VVyg=" + }, + "remote_patch_strip": 0 + } + } + }, "rules_oci@1.7.5": { "name": "rules_oci", "version": "1.7.5", @@ -1985,6 +1917,70 @@ } } }, + "jsonnet_go@0.20.0": { + "name": "jsonnet_go", + "version": "0.20.0", + "key": "jsonnet_go@0.20.0", + "repoName": "jsonnet_go", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [ + { + "extensionBzlFile": "@bazel_gazelle//:extensions.bzl", + "extensionName": "go_deps", + "usingModule": "jsonnet_go@0.20.0", + "location": { + "file": "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/MODULE.bazel", + "line": 7, + "column": 24 + }, + "imports": { + "com_github_fatih_color": "com_github_fatih_color", + "com_github_sergi_go_diff": "com_github_sergi_go_diff", + "io_k8s_sigs_yaml": "io_k8s_sigs_yaml" + }, + "devImports": [], + "tags": [ + { + "tagName": "from_file", + "attributeValues": { + "go_mod": "@jsonnet_go//:go.mod" + }, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/MODULE.bazel", + "line": 8, + "column": 18 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "bazel_gazelle": "gazelle@_", + "cpp_jsonnet": "jsonnet@0.20.0", + "io_bazel_rules_go": "rules_go@_", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/google/go-jsonnet/archive/refs/tags/v0.20.0.zip" + ], + "integrity": "sha256-EZ9sbQ3D/JrhR3GoerP+X6dOQOPj207dv0yjh5Z453c=", + "strip_prefix": "go-jsonnet-0.20.0", + "remote_patches": { + "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/patches/module_dot_bazel.patch": "sha256-7/AtC31dhw3fhB7N8XIId8R5ZkJ80Y1k6BVne8xt3eo=" + }, + "remote_patch_strip": 0 + } + } + }, "opentelemetry-proto@1.1.0": { "name": "opentelemetry-proto", "version": "1.1.0", @@ -2944,57 +2940,6 @@ } } }, - "jsonnet@0.20.0": { - "name": "jsonnet", - "version": "0.20.0", - "key": "jsonnet@0.20.0", - "repoName": "jsonnet", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [ - "//platform_defs:default_python3_toolchain" - ], - "extensionUsages": [ - { - "extensionBzlFile": "@jsonnet//tools/build_defs:extensions.bzl", - "extensionName": "build_defs", - "usingModule": "jsonnet@0.20.0", - "location": { - "file": "https://bcr.bazel.build/modules/jsonnet/0.20.0/MODULE.bazel", - "line": 5, - "column": 27 - }, - "imports": { - "default_python3_headers": "default_python3_headers", - "io_bazel_rules_jsonnet": "io_bazel_rules_jsonnet" - }, - "devImports": [], - "tags": [], - "hasDevUseExtension": false, - "hasNonDevUseExtension": true - } - ], - "deps": { - "com_google_googletest": "googletest@1.14.0.bcr.1", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/google/jsonnet/archive/refs/tags/v0.20.0.zip" - ], - "integrity": "sha256-Z0/yQbHE2OFbGYwy1d50fUklc/lbS9MesYZNm9m7CYU=", - "strip_prefix": "jsonnet-0.20.0", - "remote_patches": { - "https://bcr.bazel.build/modules/jsonnet/0.20.0/patches/module_dot_bazel.patch": "sha256-zQSfOyaUBgmoR51TJwX4JWdL/tUnjOWtpjWECRtsywc=", - "https://bcr.bazel.build/modules/jsonnet/0.20.0/patches/extensions_dot_bzl.patch": "sha256-p3qnA50AsZHbXG1TkLthairYn0MsqtpQiY41C2VHUx4=" - }, - "remote_patch_strip": 0 - } - } - }, "rules_cc@0.0.9": { "name": "rules_cc", "version": "0.0.9", @@ -3620,6 +3565,57 @@ } } }, + "jsonnet@0.20.0": { + "name": "jsonnet", + "version": "0.20.0", + "key": "jsonnet@0.20.0", + "repoName": "jsonnet", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [ + "//platform_defs:default_python3_toolchain" + ], + "extensionUsages": [ + { + "extensionBzlFile": "@jsonnet//tools/build_defs:extensions.bzl", + "extensionName": "build_defs", + "usingModule": "jsonnet@0.20.0", + "location": { + "file": "https://bcr.bazel.build/modules/jsonnet/0.20.0/MODULE.bazel", + "line": 5, + "column": 27 + }, + "imports": { + "default_python3_headers": "default_python3_headers", + "io_bazel_rules_jsonnet": "io_bazel_rules_jsonnet" + }, + "devImports": [], + "tags": [], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "com_google_googletest": "googletest@1.14.0.bcr.1", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/google/jsonnet/archive/refs/tags/v0.20.0.zip" + ], + "integrity": "sha256-Z0/yQbHE2OFbGYwy1d50fUklc/lbS9MesYZNm9m7CYU=", + "strip_prefix": "jsonnet-0.20.0", + "remote_patches": { + "https://bcr.bazel.build/modules/jsonnet/0.20.0/patches/module_dot_bazel.patch": "sha256-zQSfOyaUBgmoR51TJwX4JWdL/tUnjOWtpjWECRtsywc=", + "https://bcr.bazel.build/modules/jsonnet/0.20.0/patches/extensions_dot_bzl.patch": "sha256-p3qnA50AsZHbXG1TkLthairYn0MsqtpQiY41C2VHUx4=" + }, + "remote_patch_strip": 0 + } + } + }, "rules_license@0.0.7": { "name": "rules_license", "version": "0.0.7", @@ -10338,14 +10334,14 @@ "general": { "bzlTransitiveDigest": "D1+rhhbwX4ufoTmeUVxDpPg+Sknv3QzVXZnyK2zOjj4=", "recordedFileInputs": { - "@@//go.mod": "54aefc3b972b39981df1f30c6522ebb7c751eec7e02a9d777bab0ad145a8008b", + "@@//go.mod": "2a33f97abaceb19dd2d1474509921179b57537c2e87f0fea1eaf47317edd665b", "@@rules_go~//go.mod": "de22304b720f7f61350ec1c9739de6c0a1b1103fd22bfeb6e92c6c843ddc6d6e", "@@gazelle~//go.sum": "7c4460e8ecb5dd8691a51d4fa2e9e4751108b933636497ce46db499fc2e7a88d", "@@com_github_buildbarn_go_xdr~//go.sum": "b1e5f20131cf47d0339d501b0abd80b8851edcd738b88f8694948c4f81f97c85", "@@com_github_buildbarn_bb_storage~//go.sum": "c137d9570bae586a7044a9fe6337221b953059039902f0fc33a75e82827a0d10", "@@jsonnet_go~//go.mod": "35238699c0cd09f5e79619863a0014f01129615f811c8a30239b80e8e3a58145", "@@com_github_buildbarn_go_xdr~//go.mod": "6b49e0ea6c06c8c1cadc3257856c8a8aa9bf04ec62b23ce758488b2ec8568778", - "@@//go.sum": "c95976426058db458fc3a7e4b8ac68607bfbf8917b788d81d2e5830967d961aa", + "@@//go.sum": "43b537b9108433ea38feb68959c540f38af5c10397f97ca881c0a6a76540f3d2", "@@rules_go~//go.sum": "d56fdb19b21a5f12bcf625c49432371ac39c2def0f564098fbda107f7c080f40", "@@gazelle~//go.mod": "48dc6e771c3028ee1c18b9ffc81e596fd5f6d7e0016c5ef280e30f2821f60473", "@@com_github_buildbarn_bb_storage~//go.mod": "2c43bef8396b8ab8e4a83e8c9d3058f90d30d41b0ccd042303cf0333fc7aa7fe", @@ -12025,21 +12021,21 @@ "@rules_go~": "github.com/bazelbuild/rules_go", "com_github_bmatcuk_doublestar_v4": "github.com/bmatcuk/doublestar/v4", "org_golang_x_tools_go_vcs": "golang.org/x/tools/go/vcs", + "com_github_gogo_protobuf": "github.com/gogo/protobuf", + "org_golang_google_grpc_cmd_protoc_gen_go_grpc": "google.golang.org/grpc/cmd/protoc-gen-go-grpc", "com_github_fatih_color": "github.com/fatih/color", "com_github_sergi_go_diff": "github.com/sergi/go-diff", "com_github_mattn_go_colorable": "github.com/mattn/go-colorable", "com_github_mattn_go_isatty": "github.com/mattn/go-isatty", "in_gopkg_yaml_v2": "gopkg.in/yaml.v2", - "com_github_gogo_protobuf": "github.com/gogo/protobuf", - "org_golang_google_grpc_cmd_protoc_gen_go_grpc": "google.golang.org/grpc/cmd/protoc-gen-go-grpc", "@gazelle~": "github.com/bazelbuild/bazel-gazelle" }, "module_names": { "@com_github_buildbarn_bb_storage~": "com_github_buildbarn_bb_storage", "@com_github_buildbarn_go_xdr~": "com_github_buildbarn_go_xdr", "@gazelle~": "gazelle", - "@jsonnet_go~": "jsonnet_go", - "@rules_go~": "rules_go" + "@rules_go~": "rules_go", + "@jsonnet_go~": "jsonnet_go" }, "build_naming_conventions": {} } diff --git a/go.mod b/go.mod index bb04a2d9..b2442d93 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( cloud.google.com/go/longrunning v0.5.6 github.com/bazelbuild/buildtools v0.0.0-20240313121412-66c605173954 github.com/bazelbuild/remote-apis v0.0.0-20240319211552-96942a2107c7 - github.com/buildbarn/bb-storage v0.0.0-20240331131648-914e53aad8cd + github.com/buildbarn/bb-storage v0.0.0-20240401072224-dee7e428a0bd github.com/buildbarn/go-xdr v0.0.0-20240330061811-9cb8426d3e09 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.4 diff --git a/go.sum b/go.sum index ff85f987..82676921 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/bazelbuild/remote-apis v0.0.0-20240319211552-96942a2107c7/go.mod h1:r github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/buildbarn/bb-storage v0.0.0-20240331131648-914e53aad8cd h1:U9gyt98mAxbZTC0sd40+C/wDCKi5y5IjaCqFslTqVUw= -github.com/buildbarn/bb-storage v0.0.0-20240331131648-914e53aad8cd/go.mod h1:C4+j4QJ0gapWsJ9xBkktZJBcLUDuvTacOGlSardmAnc= +github.com/buildbarn/bb-storage v0.0.0-20240401072224-dee7e428a0bd h1:6GeYkbQurtcCfPjzCHux3iPo4eby72CxsE1QrDSJBAg= +github.com/buildbarn/bb-storage v0.0.0-20240401072224-dee7e428a0bd/go.mod h1:C4+j4QJ0gapWsJ9xBkktZJBcLUDuvTacOGlSardmAnc= github.com/buildbarn/go-xdr v0.0.0-20240330061811-9cb8426d3e09 h1:ozrt5fA2y0Nnnl4LHCWVuLNhoBX9KzcPm0X9nNr9yZM= github.com/buildbarn/go-xdr v0.0.0-20240330061811-9cb8426d3e09/go.mod h1:mnTFeBEr6A2gouVtVOhwu7EPU8Fs66KpryWGAED+XCE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -99,8 +99,6 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= -github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -110,11 +108,6 @@ github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+Licev github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -123,8 +116,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -152,8 +143,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDa github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 h1:RoziI+96HlQWrbaVhgOOdFYUHtX81pwA6tCgDS9FNRo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1/go.mod h1:Rj8lEaVgLiPn1jTMVXEhATiZhuyXJq167bMYPbJM1CY= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= github.com/hanwen/go-fuse/v2 v2.5.1 h1:OQBE8zVemSocRxA4OaFJbjJ5hlpCmIWbGr7r0M4uoQQ= @@ -395,21 +384,8 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/tools/github_workflows/BUILD.bazel b/tools/github_workflows/BUILD.bazel index 5877fe76..0c76759e 100644 --- a/tools/github_workflows/BUILD.bazel +++ b/tools/github_workflows/BUILD.bazel @@ -1,4 +1,4 @@ -load("@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library", "jsonnet_to_json") +load("@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library", "jsonnet_to_json") jsonnet_to_json( name = "github_workflows",