Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions docker.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKER_IMAGE_TAG=202508131912
LINTER_IMAGE_DIGEST=db3238ae3ab3f0fe307aef8920a29b5f0df808248c16a1650baa228c4cefbd4c
DEV_IMAGE_DIGEST=42c7f00b68db0835c266c5aceb6f67ec7e43342336f95218af14e19858e08854
DEV_IMAGE_WITH_EXTRAS_DIGEST=bbcd6dc6d269231163be9782d42bdf2b2855a34ab384a853fa67e13e946948ec
DOCKER_IMAGE_TAG=202512082352
LINTER_IMAGE_DIGEST=441fc5a65697dab0b38627d5afde9e38da6812f1a5b98732b224161c23238e73
DEV_IMAGE_DIGEST=cac2e8a1c3e70dde4e5089b2383b2e11cc022af467ee430c12416eb42066fbb7
DEV_IMAGE_WITH_EXTRAS_DIGEST=e84f82d62540e1ca72650f8f7c9c4fe0b32b64a33f04cf0b913b9961527c9e30
2 changes: 1 addition & 1 deletion tools/chef/base_image_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
202503281433
202512091427
8 changes: 4 additions & 4 deletions tools/chef/cookbooks/px_dev/attributes/linux.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
default['owner'] = 'root'
default['group'] = 'root'

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

default['codecov']['download_path'] =
'https://uploader.codecov.io/v0.2.3/linux/codecov'
Expand Down
8 changes: 4 additions & 4 deletions tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
default['owner'] = node['current_user']
default['group'] = 'wheel'

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

default['codecov']['download_path'] =
'https://uploader.codecov.io/v0.2.3/macos/codecov'
Expand Down
4 changes: 2 additions & 2 deletions tools/chef/cookbooks/px_dev/recipes/linters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
action :create
end

common_remote_bin 'bazel' do
bin_name 'bazel_core'
common_remote_bin 'bazelisk' do
bin_name 'bazelisk'
end

if platform_family?('debian')
Expand Down
4 changes: 2 additions & 2 deletions tools/chef/cookbooks/px_dev/templates/bazel.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# * Adds a --config=clang by default if it's missing from the command line.
# Check if this is this pixie repo, otherwise just passthrough to bazel_core.
if ! grep 'workspace(name\s=\s"px")' "$(git rev-parse --show-toplevel 2> /dev/null)/WORKSPACE" &> /dev/null; then
/opt/px_dev/bin/bazel_core "$@"
/opt/px_dev/bin/bazelisk "$@"
exit $?
fi;

Expand All @@ -36,4 +36,4 @@ fi;
cmd=$1
shift

/opt/px_dev/bin/bazel_core ${cmd:+"$cmd"} ${config:+"$config"} "$@"
/opt/px_dev/bin/bazelisk ${cmd:+"$cmd"} ${config:+"$config"} "$@"
7 changes: 4 additions & 3 deletions tools/chef/cookbooks/px_dev_extras/attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#
# SPDX-License-Identifier: Apache-2.0

default['bazel']['zsh_completions'] =
"https://raw.githubusercontent.com/bazelbuild/bazel/6.0.0/scripts/zsh_completion/_bazel"
default['bazel']['zcomp_sha256'] = '4094dc84add2f23823bc341186adf6b8487fbd5d4164bd52d98891c41511eba4'
# Fetch bazel version from Pixie's .bazelversion on main branch
bazel_version = Chef::HTTP.new('https://raw.githubusercontent.com').get('/pixie-io/pixie/main/.bazelversion').strip
default['bazel']['zsh_completions'] =
"https://raw.githubusercontent.com/bazelbuild/bazel/#{bazel_version}/scripts/zsh_completion/_bazel"
4 changes: 2 additions & 2 deletions tools/chef/cookbooks/px_dev_extras/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@

remote_file '/usr/local/share/zsh/site-functions/_bazel' do
source node['bazel']['zsh_completions']
mode 0644
checksum node['bazel']['zcomp_sha256']
mode '0644'
action :create
end

common_remote_bin 'faq'
Expand Down
Loading