From fb5ebc70fb78da70e6970276a6ed5d95eb1db52d Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Thu, 19 Dec 2024 00:31:06 +0000 Subject: [PATCH] Upgrade `github.com/bazelbuild/bazelisk` to `v1.21.0` This pulls in https://github.com/bazelbuild/bazelisk/pull/604 to allow downloading bazel commits on aarch64 linux. The only weird thing about this is we now provide a repo_mapping to that repo because it started using the new bzlmod names for rules_go and gazelle. This doesn't upgrade to the latest version of bazelisk because that would require other API changes. --- deps.bzl | 12 ++++++++---- go.mod | 4 ++-- go.sum | 7 ++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/deps.bzl b/deps.bzl index d1f86ae58ff..e2256b5e2ce 100644 --- a/deps.bzl +++ b/deps.bzl @@ -436,8 +436,12 @@ def install_go_mod_dependencies(workspace_name = "buildbuddy"): name = "com_github_bazelbuild_bazelisk", build_file_generation = "on", importpath = "github.com/bazelbuild/bazelisk", - sum = "h1:TOh9touXYcKKiZqE+Dj4XD/FHrzsqmu9iDvPTsW9jIc=", - version = "v1.19.0", + repo_mapping = { + "@rules_go": "@io_bazel_rules_go", + "@gazelle": "@bazel_gazelle", + }, + sum = "h1:qVPSlr31TbH9/wwZo3ciHmrw2zP06XPSGyZIlojrAOc=", + version = "v1.21.0", ) go_repository( name = "com_github_bazelbuild_buildtools", @@ -2542,8 +2546,8 @@ def install_go_mod_dependencies(workspace_name = "buildbuddy"): go_repository( name = "com_github_hashicorp_go_version", importpath = "github.com/hashicorp/go-version", - sum = "h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=", - version = "v1.6.0", + sum = "h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=", + version = "v1.7.0", ) go_repository( name = "com_github_hashicorp_golang_lru", diff --git a/go.mod b/go.mod index 1c3b0320c87..54b60636d0a 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/smithy-go v1.13.5 github.com/awslabs/soci-snapshotter v0.1.0 github.com/bazelbuild/bazel-gazelle v0.39.0 - github.com/bazelbuild/bazelisk v1.19.0 + github.com/bazelbuild/bazelisk v1.21.0 github.com/bazelbuild/buildtools v0.0.0-20240827154017-dd10159baa91 github.com/bazelbuild/rules_go v0.50.1 github.com/bazelbuild/rules_webtesting v0.0.0-20210910170740-6b2ef24cfe95 @@ -290,7 +290,7 @@ require ( github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-sockaddr v1.0.6 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/huandu/xstrings v1.4.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect diff --git a/go.sum b/go.sum index 4745fd91dba..6a3c0a35554 100644 --- a/go.sum +++ b/go.sum @@ -251,8 +251,8 @@ github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bazelbuild/bazel-gazelle v0.39.0 h1:5RCU7g9tWPOa1ySkQgpPRDhiXfG5+38W4acSuKSQyrs= github.com/bazelbuild/bazel-gazelle v0.39.0/go.mod h1:3vVgNuO49N8bghRC63OY+MHWalzXyoI9nH6XeEjf1lQ= -github.com/bazelbuild/bazelisk v1.19.0 h1:TOh9touXYcKKiZqE+Dj4XD/FHrzsqmu9iDvPTsW9jIc= -github.com/bazelbuild/bazelisk v1.19.0/go.mod h1:EwrQdJpNWr17zu6UWVk49YBNZ9MkIgTkOUwfTIeaRnc= +github.com/bazelbuild/bazelisk v1.21.0 h1:qVPSlr31TbH9/wwZo3ciHmrw2zP06XPSGyZIlojrAOc= +github.com/bazelbuild/bazelisk v1.21.0/go.mod h1:QDwwOnFE/mlQsmqo9XOzakiPbpBUlH5/eq4NcGB51q4= github.com/bazelbuild/buildtools v0.0.0-20240827154017-dd10159baa91 h1:/wpuwyWvp46gZfQCmbR+4SI5ne7IjRUM5lsXTzpAeWM= github.com/bazelbuild/buildtools v0.0.0-20240827154017-dd10159baa91/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg= github.com/bazelbuild/rules_go v0.50.1 h1:/BUvuaB8MEiUA2oLPPCGtuw5V+doAYyiGTFyoSWlkrw= @@ -994,8 +994,9 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=