From 4d8972236425ce69f1bdca8da4bc78ce195f67b3 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Mon, 1 Apr 2024 22:44:46 +0200 Subject: [PATCH] Use rules_jsonnet from BCR --- MODULE.bazel | 13 +- MODULE.bazel.lock | 398 ++++++++++++++--------------- go.mod | 12 +- go.sum | 24 +- tools/github_workflows/BUILD.bazel | 2 +- 5 files changed, 210 insertions(+), 239 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 5a6880b..4361ed0 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -5,20 +5,20 @@ 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") bazel_dep(name = "gazelle", version = "0.35.0") -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 = "toolchains_llvm", version = "1.0.0") git_override( module_name = "com_github_buildbarn_bb_remote_execution", - commit = "f84a2c0f72119f6d3b157905a00163d0f167a73e", + commit = "ea22f37f62b885026ad9e1aa0d62deb15dbb454a", remote = "https://github.com/buildbarn/bb-remote-execution.git", ) git_override( module_name = "com_github_buildbarn_bb_storage", - commit = "914e53aad8cd16fc4c1ecd7f706149e8440ea24a", + commit = "dee7e428a0bd962b192512aad8f3ff76dcc0f437", remote = "https://github.com/buildbarn/bb-storage.git", ) @@ -97,13 +97,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"], -) - llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True) llvm.toolchain( llvm_version = "14.0.0", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index d674526..9f4aa32 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 6, - "moduleFileHash": "aee7170ab8d60bab2259fb179b1dd88625e24904c36bc9d21a01e5cc958363f7", + "moduleFileHash": "739a91c34209a5cd337b6e437d7bd0def6506c906e83fa674e532e353784ef68", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -128,8 +128,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": [ @@ -150,23 +149,6 @@ "line": 92, "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": 100, - "column": 13 - } } ], "hasDevUseExtension": false, @@ -178,7 +160,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 107, + "line": 100, "column": 21 }, "imports": { @@ -196,7 +178,7 @@ "devDependency": true, "location": { "file": "@@//:MODULE.bazel", - "line": 108, + "line": 101, "column": 15 } } @@ -210,7 +192,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 113, + "line": 106, "column": 20 }, "imports": { @@ -228,7 +210,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 114, + "line": 107, "column": 23 } } @@ -243,9 +225,9 @@ "com_github_buildbarn_bb_storage": "com_github_buildbarn_bb_storage@_", "com_github_buildbarn_go_xdr": "com_github_buildbarn_go_xdr@_", "gazelle": "gazelle@_", - "google_jsonnet_go": "jsonnet_go@0.20.0", "protobuf": "protobuf@23.1", "rules_go": "rules_go@0.46.0", + "rules_jsonnet": "rules_jsonnet@0.5.0", "toolchains_llvm": "toolchains_llvm@1.0.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -436,7 +418,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" }, @@ -460,23 +441,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": "@@com_github_buildbarn_bb_remote_execution~//:MODULE.bazel", - "line": 133, - "column": 13 - } - }, { "tagName": "@bazel_tools//tools/build_defs/repo:http.bzl%http_file", "attributeValues": { @@ -491,7 +455,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_remote_execution~//:MODULE.bazel", - "line": 142, + "line": 135, "column": 10 } }, @@ -509,7 +473,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_remote_execution~//:MODULE.bazel", - "line": 150, + "line": 143, "column": 10 } } @@ -523,7 +487,7 @@ "usingModule": "com_github_buildbarn_bb_remote_execution@_", "location": { "file": "@@com_github_buildbarn_bb_remote_execution~//:MODULE.bazel", - "line": 164, + "line": 157, "column": 20 }, "imports": { @@ -541,7 +505,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_remote_execution~//:MODULE.bazel", - "line": 165, + "line": 158, "column": 23 } } @@ -555,7 +519,7 @@ "usingModule": "com_github_buildbarn_bb_remote_execution@_", "location": { "file": "@@com_github_buildbarn_bb_remote_execution~//:MODULE.bazel", - "line": 172, + "line": 165, "column": 20 }, "imports": { @@ -577,7 +541,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_remote_execution~//:MODULE.bazel", - "line": 173, + "line": 166, "column": 9 } } @@ -593,9 +557,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@0.46.0", + "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", @@ -618,7 +582,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 27, + "line": 28, "column": 23 }, "imports": {}, @@ -632,7 +596,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 28, + "line": 29, "column": 16 } } @@ -646,7 +610,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 30, + "line": 31, "column": 24 }, "imports": { @@ -704,7 +668,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 31, + "line": 32, "column": 18 } } @@ -722,8 +686,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": [ @@ -741,24 +704,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 } } @@ -772,7 +718,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 138, + "line": 132, "column": 20 }, "imports": { @@ -790,7 +736,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 139, + "line": 133, "column": 23 } } @@ -804,7 +750,7 @@ "usingModule": "com_github_buildbarn_bb_storage@_", "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 146, + "line": 140, "column": 20 }, "imports": { @@ -826,7 +772,7 @@ "devDependency": false, "location": { "file": "@@com_github_buildbarn_bb_storage~//:MODULE.bazel", - "line": 147, + "line": 141, "column": 9 } } @@ -840,10 +786,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@0.46.0", + "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", @@ -1070,70 +1017,6 @@ "local_config_platform": "local_config_platform@_" } }, - "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@0.46.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/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", @@ -1344,6 +1227,37 @@ } } }, + "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 + } + } + }, "toolchains_llvm@1.0.0": { "name": "toolchains_llvm", "version": "1.0.0", @@ -2086,6 +2000,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@0.46.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/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", @@ -2165,57 +2143,6 @@ "local_config_platform": "local_config_platform@_" } }, - "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_python@0.31.0": { "name": "rules_python", "version": "0.31.0", @@ -2951,6 +2878,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", @@ -13230,15 +13208,15 @@ "bzlTransitiveDigest": "D1+rhhbwX4ufoTmeUVxDpPg+Sknv3QzVXZnyK2zOjj4=", "recordedFileInputs": { "@@rules_go~//go.mod": "de22304b720f7f61350ec1c9739de6c0a1b1103fd22bfeb6e92c6c843ddc6d6e", - "@@com_github_buildbarn_bb_remote_execution~//go.sum": "c95976426058db458fc3a7e4b8ac68607bfbf8917b788d81d2e5830967d961aa", + "@@com_github_buildbarn_bb_remote_execution~//go.sum": "43b537b9108433ea38feb68959c540f38af5c10397f97ca881c0a6a76540f3d2", "@@com_github_buildbarn_go_xdr~//go.mod": "6b49e0ea6c06c8c1cadc3257856c8a8aa9bf04ec62b23ce758488b2ec8568778", - "@@//go.sum": "437b88ba25aa6f986b11f7cb5a3d57ae3f27ab5e6cb36c79250834bacef0552c", + "@@//go.sum": "ba109763dc85c6a5830f8516c0ae6efdf3562808419a9a01a3e578f595103359", "@@gazelle~//go.mod": "48dc6e771c3028ee1c18b9ffc81e596fd5f6d7e0016c5ef280e30f2821f60473", "@@com_github_buildbarn_bb_storage~//go.mod": "2c43bef8396b8ab8e4a83e8c9d3058f90d30d41b0ccd042303cf0333fc7aa7fe", "@@jsonnet_go~//go.sum": "cf6cba94b78ec389dcea5dda9207b611deea699e8dbbe45e98b7a7f990482bb4", - "@@//go.mod": "ba646547ea8a562dea757010e039aa8d9862e0c95a346212c28cecc7d1d34380", + "@@//go.mod": "9dec0a3b0e7acc8e88ed27649398b908dc1e67fa004892a46fead2276656f467", "@@gazelle~//go.sum": "7c4460e8ecb5dd8691a51d4fa2e9e4751108b933636497ce46db499fc2e7a88d", - "@@com_github_buildbarn_bb_remote_execution~//go.mod": "54aefc3b972b39981df1f30c6522ebb7c751eec7e02a9d777bab0ad145a8008b", + "@@com_github_buildbarn_bb_remote_execution~//go.mod": "2a33f97abaceb19dd2d1474509921179b57537c2e87f0fea1eaf47317edd665b", "@@com_github_buildbarn_go_xdr~//go.sum": "b1e5f20131cf47d0339d501b0abd80b8851edcd738b88f8694948c4f81f97c85", "@@com_github_buildbarn_bb_storage~//go.sum": "c137d9570bae586a7044a9fe6337221b953059039902f0fc33a75e82827a0d10", "@@jsonnet_go~//go.mod": "35238699c0cd09f5e79619863a0014f01129615f811c8a30239b80e8e3a58145", @@ -13809,9 +13787,9 @@ "build_extra_args": [], "patches": [], "patch_args": [], - "sum": "h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo=", + "sum": "h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4=", "replace": "", - "version": "v0.0.0-20240325203815-454cdb8f5daa" + "version": "v0.0.0-20240401170217-c3f982113cda" } }, "com_github_aws_aws_sdk_go_v2_internal_endpoints_v2": { @@ -14289,9 +14267,9 @@ "build_extra_args": [], "patches": [], "patch_args": [], - "sum": "h1:Jt1XW5PaLXF1/ePZrznsh/aAUvI7Adfc3LY1dAKlzRs=", + "sum": "h1:b6F6WIV4xHHD0FA4oIyzU6mHWg2WI2X1RBehwa5QN38=", "replace": "", - "version": "v0.0.0-20240325203815-454cdb8f5daa" + "version": "v0.0.0-20240401170217-c3f982113cda" } }, "org_golang_google_protobuf": { @@ -14544,9 +14522,9 @@ "build_extra_args": [], "patches": [], "patch_args": [], - "sum": "h1:wBkzraZsSqhj1M4L/nMrljUU6XasJkgHvUsq8oRGwF0=", + "sum": "h1:O77/tf8XXfErAKafUOaAtuDyynGoufcD0mnG++LziIs=", "replace": "", - "version": "v0.0.0-20240325203815-454cdb8f5daa" + "version": "v0.0.0-20240401170217-c3f982113cda" } }, "com_github_aws_aws_sdk_go_v2_aws_protocol_eventstream": { @@ -14679,9 +14657,9 @@ "build_extra_args": [], "patches": [], "patch_args": [], - "sum": "h1:ePqxpG3LVx+feAUOx8YmR5T7rc0rdzK8DyxM8cQ9zq0=", + "sum": "h1:wu/KJm9KJwpfHWhkkZGohVC6KRrc1oJNr4jwtQMOQXw=", "replace": "", - "version": "v0.0.0-20240325203815-454cdb8f5daa" + "version": "v0.0.0-20240401170217-c3f982113cda" } }, "com_github_hanwen_go_fuse_v2": { @@ -15084,13 +15062,13 @@ "@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": { @@ -15098,8 +15076,8 @@ "@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 a812aa0..ee64761 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ replace google.golang.org/protobuf => google.golang.org/protobuf v1.32.0 require ( github.com/bazelbuild/buildtools v0.0.0-20240313121412-66c605173954 github.com/bazelbuild/remote-apis v0.0.0-20240319211552-96942a2107c7 - github.com/buildbarn/bb-remote-execution v0.0.0-20240331151324-f84a2c0f7211 - github.com/buildbarn/bb-storage v0.0.0-20240331131648-914e53aad8cd + github.com/buildbarn/bb-remote-execution v0.0.0-20240401130706-ea22f37f62b8 + github.com/buildbarn/bb-storage v0.0.0-20240401072224-dee7e428a0bd github.com/buildkite/terminal-to-html v3.2.0+incompatible github.com/dustin/go-humanize v1.0.1 github.com/gorilla/mux v1.8.1 @@ -105,9 +105,9 @@ require ( golang.org/x/tools v0.19.0 // indirect google.golang.org/api v0.172.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa // indirect - google.golang.org/genproto/googleapis/bytestream v0.0.0-20240325203815-454cdb8f5daa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect + google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto/googleapis/bytestream v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 7febf5e..43ccb56 100644 --- a/go.sum +++ b/go.sum @@ -65,10 +65,10 @@ 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-remote-execution v0.0.0-20240331151324-f84a2c0f7211 h1:F1RTcRUeiwDXz+wRY6y65YmXkQirQ8/20745DJPHEUw= -github.com/buildbarn/bb-remote-execution v0.0.0-20240331151324-f84a2c0f7211/go.mod h1:LDoqkCa2e1r7Mjnkv64xUSW+L94B/36PEFPEhdZWBeY= -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-remote-execution v0.0.0-20240401130706-ea22f37f62b8 h1:560kZ2mYJVhKZQ9F9RdL42ekzywwoLCfTrPHcBRChuM= +github.com/buildbarn/bb-remote-execution v0.0.0-20240401130706-ea22f37f62b8/go.mod h1:znbMNc0OwrbMXLddJSfZaVSVhHfjVja05/ourZA30eo= +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/buildkite/terminal-to-html v3.2.0+incompatible h1:WdXzl7ZmYzCAz4pElZosPaUlRTW+qwVx/SkQSCa1jXs= github.com/buildkite/terminal-to-html v3.2.0+incompatible/go.mod h1:BFFdFecOxCgjdcarqI+8izs6v85CU/1RA/4Bqh4GR7E= github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY= @@ -384,14 +384,14 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20210506142907-4a47615972c2/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa h1:ePqxpG3LVx+feAUOx8YmR5T7rc0rdzK8DyxM8cQ9zq0= -google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:CnZenrTdRJb7jc+jOm0Rkywq+9wh0QC4U8tyiRbEPPM= -google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa h1:Jt1XW5PaLXF1/ePZrznsh/aAUvI7Adfc3LY1dAKlzRs= -google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:K4kfzHtI0kqWA79gecJarFtDn/Mls+GxQcg3Zox91Ac= -google.golang.org/genproto/googleapis/bytestream v0.0.0-20240325203815-454cdb8f5daa h1:wBkzraZsSqhj1M4L/nMrljUU6XasJkgHvUsq8oRGwF0= -google.golang.org/genproto/googleapis/bytestream v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:IN9OQUXZ0xT+26MDwZL8fJcYw+y99b0eYPA2U15Jt8o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda h1:wu/KJm9KJwpfHWhkkZGohVC6KRrc1oJNr4jwtQMOQXw= +google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda/go.mod h1:g2LLCvCeCSir/JJSWosk19BR4NVxGqHUC6rxIRsd7Aw= +google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda h1:b6F6WIV4xHHD0FA4oIyzU6mHWg2WI2X1RBehwa5QN38= +google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda/go.mod h1:AHcE/gZH76Bk/ROZhQphlRoWo5xKDEtz3eVEO1LfA8c= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240401170217-c3f982113cda h1:O77/tf8XXfErAKafUOaAtuDyynGoufcD0mnG++LziIs= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240401170217-c3f982113cda/go.mod h1:IN9OQUXZ0xT+26MDwZL8fJcYw+y99b0eYPA2U15Jt8o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/tools/github_workflows/BUILD.bazel b/tools/github_workflows/BUILD.bazel index 1260246..f7dee3f 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",