Skip to content

CHEF-21123 - Ruby 3.4 update in chef-cli hab package #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikhil2611 merged 3 commits into from
Jun 11, 2025
Merged

CHEF-21123 - Ruby 3.4 update in chef-cli hab package #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56af846
update ruby to 3.4 and fetch from base-2025 channel
nikhil2611 Jun 5, 2025
c204c07
updating channel name and ruby versopn in pipeline
nikhil2611 Jun 6, 2025
ed438ad
addition of Habitat authentication tokens in habitat-test.pipeline.yml
nikhil2611 Jun 11, 2025
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
9 changes: 9 additions & 0 deletions .buildkite/hooks/pre-command
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

if [[ $BUILDKITE_ORGANIZATION_SLUG = 'chef-canary' ]]; then
AWS_REGION='us-west-1'
elif [[ $BUILDKITE_ORGANIZATION_SLUG = 'chef' ]] || [[ $BUILDKITE_ORGANIZATION_SLUG = 'chef-oss' ]]; then
AWS_REGION='us-west-2'
fi

export HAB_AUTH_TOKEN=$(aws ssm get-parameter --name 'habitat-prod-auth-token' --with-decryption --query Parameter.Value --output text --region ${AWS_REGION})
3 changes: 1 addition & 2 deletions .expeditor/buildkite/artifact.habitat.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ export HAB_ORIGIN='ci'
export PLAN='chef-cli'
export CHEF_LICENSE="accept-no-persist"
export HAB_LICENSE="accept-no-persist"
export HAB_BLDR_CHANNEL="LTS-2024"
export HAB_REFRESH_CHANNEL="LTS-2024"
export HAB_REFRESH_CHANNEL="base-2025"

echo "--- checking if git is installed"
if ! command -v git &> /dev/null; then
Expand Down
5 changes: 4 additions & 1 deletion .expeditor/habitat-test.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ steps:
expeditor:
executor:
docker:
image: ruby:3.1
image: ruby:3.4
privileged: true
environment:
- HAB_AUTH_TOKEN

- label: ":windows: Validate Habitat Builds of Test Kitchen"
commands:
Expand All @@ -30,6 +32,7 @@ steps:
image: rubydistros/windows-2019:3.1
user: 'NT AUTHORITY\SYSTEM'
environment:
- HAB_AUTH_TOKEN
- FORCE_FFI_YAJL=ext
- EXPIRE_CACHE=true
- CHEF_LICENSE=accept-no-persist
Expand Down
7 changes: 3 additions & 4 deletions habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
export HAB_BLDR_CHANNEL="LTS-2024"
export HAB_REFRESH_CHANNEL="LTS-2024"
export HAB_REFRESH_CHANNEL="base-2025"
pkg_name=chef-cli
pkg_origin=chef
ruby_pkg="core/ruby3_1"
ruby_pkg="core/ruby3_4"
pkg_deps=(${ruby_pkg} core/coreutils core/libarchive)
pkg_build_deps=(
core/make
Expand All @@ -20,7 +19,7 @@ do_setup_environment() {
export GEM_PATH="$GEM_HOME"
}
do_prepare() {
ln -sf "$(pkg_interpreter_for core/ruby3_1 bin/ruby)" "$(pkg_interpreter_for core/coreutils bin/env)"
ln -sf "$(pkg_interpreter_for core/ruby3_4 bin/ruby)" "$(pkg_interpreter_for core/coreutils bin/env)"
}
pkg_version() {
cat "$SRC_PATH/VERSION"
Expand Down
Loading