Skip to content

Commit 8b27f25

Browse files
committed
Replace raw use of bazel with bazelisk
Signed-off-by: Dom Del Nano <ddelnano@gmail.com> (cherry picked from commit 57710ed)
1 parent 770c509 commit 8b27f25

8 files changed

Lines changed: 17 additions & 26 deletions

File tree

docker.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DOCKER_IMAGE_TAG=202508131912
2-
LINTER_IMAGE_DIGEST=db3238ae3ab3f0fe307aef8920a29b5f0df808248c16a1650baa228c4cefbd4c
3-
DEV_IMAGE_DIGEST=42c7f00b68db0835c266c5aceb6f67ec7e43342336f95218af14e19858e08854
4-
DEV_IMAGE_WITH_EXTRAS_DIGEST=bbcd6dc6d269231163be9782d42bdf2b2855a34ab384a853fa67e13e946948ec
1+
DOCKER_IMAGE_TAG=202512081623
2+
LINTER_IMAGE_DIGEST=b21bc41ec975ed48ef73f3888c17044b7a6ab0558cc8fb83a837928f9f540a05
3+
DEV_IMAGE_DIGEST=8b9bb04c2db41988cea0627599715a6f7e6834ca05cca30691cba59c7fe47eba
4+
DEV_IMAGE_WITH_EXTRAS_DIGEST=6dc422b99c32b297915c771449f80fc5aecdd1ac8fecad22e39ff20b73321f53

tools/chef/base_image_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
202503281433
1+
202512082132

tools/chef/cookbooks/px_dev/attributes/linux.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
default['owner'] = 'root'
2323
default['group'] = 'root'
2424

25-
default['bazel']['download_path'] =
26-
"https://github.com/bazelbuild/bazel/releases/download/6.2.0/bazel-6.2.0-linux-x86_64"
27-
default['bazel']['sha256'] =
28-
'3d11c26fb9ba12c833844450bb90165b176e8a19cb5cf5923f3cec855837f17c'
25+
default['bazelisk']['download_path'] =
26+
"https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-amd64"
27+
default['bazelisk']['sha256'] =
28+
'e1508323f347ad1465a887bc5d2bfb91cffc232d11e8e997b623227c6b32fb76'
2929

3030
default['codecov']['download_path'] =
3131
'https://uploader.codecov.io/v0.2.3/linux/codecov'

tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
default['owner'] = node['current_user']
2424
default['group'] = 'wheel'
2525

26-
default['bazel']['download_path'] =
27-
"https://github.com/bazelbuild/bazel/releases/download/6.2.0/bazel-6.2.0-darwin-x86_64"
28-
default['bazel']['sha256'] =
29-
'd2356012843ce3a2fbba89f88191673a6ad2f7716cc46ad43ec1bcee78d36b44'
26+
default['bazelisk']['download_path'] =
27+
"https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-darwin-amd64"
28+
default['bazelisk']['sha256'] =
29+
'8fcd7ba828f673ba4b1529425e01e15ac42599ef566c17f320d8cbfe7b96a167'
3030

3131
default['codecov']['download_path'] =
3232
'https://uploader.codecov.io/v0.2.3/macos/codecov'

tools/chef/cookbooks/px_dev/recipes/linters.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
action :create
4848
end
4949

50-
common_remote_bin 'bazel' do
51-
bin_name 'bazel_core'
50+
common_remote_bin 'bazelisk' do
51+
bin_name 'bazelisk'
5252
end
5353

5454
if platform_family?('debian')

tools/chef/cookbooks/px_dev/templates/bazel.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# * Adds a --config=clang by default if it's missing from the command line.
2020
# Check if this is this pixie repo, otherwise just passthrough to bazel_core.
2121
if ! grep 'workspace(name\s=\s"px")' "$(git rev-parse --show-toplevel 2> /dev/null)/WORKSPACE" &> /dev/null; then
22-
/opt/px_dev/bin/bazel_core "$@"
22+
/opt/px_dev/bin/bazelisk "$@"
2323
exit $?
2424
fi;
2525

@@ -36,4 +36,4 @@ fi;
3636
cmd=$1
3737
shift
3838

39-
/opt/px_dev/bin/bazel_core ${cmd:+"$cmd"} ${config:+"$config"} "$@"
39+
/opt/px_dev/bin/bazelisk ${cmd:+"$cmd"} ${config:+"$config"} "$@"

tools/chef/cookbooks/px_dev_extras/attributes/default.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,3 @@
1414
#
1515
# SPDX-License-Identifier: Apache-2.0
1616

17-
default['bazel']['zsh_completions'] =
18-
"https://raw.githubusercontent.com/bazelbuild/bazel/6.0.0/scripts/zsh_completion/_bazel"
19-
default['bazel']['zcomp_sha256'] = '4094dc84add2f23823bc341186adf6b8487fbd5d4164bd52d98891c41511eba4'

tools/chef/cookbooks/px_dev_extras/recipes/default.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
homebrew_package pkg_list
4141
end
4242

43-
remote_file '/usr/local/share/zsh/site-functions/_bazel' do
44-
source node['bazel']['zsh_completions']
45-
mode 0644
46-
checksum node['bazel']['zcomp_sha256']
47-
end
48-
4943
common_remote_bin 'faq'
5044
common_remote_bin 'kubectl'
5145
common_remote_tar_bin 'kustomize'

0 commit comments

Comments
 (0)