Skip to content

build chef-cli against to base 2025 #294

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 6 commits into from
Jul 14, 2025
Merged

build chef-cli against to base 2025 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8062c25
build chef-cli against to base 2025
muthuja Jul 11, 2025
a909924
build chef-cli against to base 2025
muthuja Jul 11, 2025
809497d
modify pkg dep pull from core/ruby
muthuja Jul 14, 2025
f4ae870
use ruby 3.4 image
muthuja Jul 14, 2025
79f1436
Merge branch 'main' into CHEF-19444-chef-cli-to-build-against-base-20…
muthuja Jul 14, 2025
538c00c
updated from blank? to empty?
nikhil2611 Jul 14, 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
5 changes: 2 additions & 3 deletions .expeditor/buildkite/artifact.habitat.test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# TODO: Set-StrictMode -Version Latest
$PSDefaultParameterValues['*:ErrorAction']='Stop'
$ErrorActionPreference = 'Stop'
$env:HAB_BLDR_CHANNEL = "LTS-2024"
$env:HAB_REFRESH_CHANNEL = "LTS-2024"
$env:HAB_BLDR_CHANNEL = "base-2025"
$env:HAB_REFRESH_CHANNEL = "base-2025"
$env:CHEF_LICENSE = 'accept-no-persist'
$env:HAB_LICENSE = 'accept-no-persist'
$Plan = 'chef-cli'
Expand Down Expand Up @@ -61,7 +61,6 @@ finally {
Write-Host "HAB_ORIGIN set to 'ci' after installation."
$env:HAB_ORIGIN = 'ci'


Write-Host "--- Generating fake origin key"
hab origin key generate $env:HAB_ORIGIN

Expand Down
1 change: 0 additions & 1 deletion .expeditor/buildkite/artifact.habitat.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ echo "--- Installing Habitat"
id -a
curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash

# Set HAB_ORIGIN after Habitat installation
echo "--- Setting HAB_ORIGIN to 'ci' after installation"
export HAB_ORIGIN='ci'

Expand Down
2 changes: 1 addition & 1 deletion .expeditor/habitat-test.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ steps:
docker:
host_os: windows
shell: ["powershell", "-Command"]
image: rubydistros/windows-2019:3.1
image: rubydistros/windows-2019:3.4
user: 'NT AUTHORITY\SYSTEM'
environment:
- HAB_AUTH_TOKEN
Expand Down
6 changes: 3 additions & 3 deletions habitat/plan.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$ErrorActionPreference = "Stop"
$PSDefaultParameterValues['*:ErrorAction']='Stop'

$env:HAB_BLDR_CHANNEL = "LTS-2024"
$env:HAB_REFRESH_CHANNEL = "LTS-2024"
$env:HAB_BLDR_CHANNEL = "base-2025"
$env:HAB_REFRESH_CHANNEL = "base-2025"
$pkg_name="chef-cli"
$pkg_origin="chef"
$pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")
$pkg_maintainer="The Chef Maintainers <[email protected]>"

$pkg_deps=@(
"chef/ruby31-plus-devkit"
"core/ruby3_4-plus-devkit"
"core/git"
)
$pkg_bin_dirs=@("bin"
Expand Down
2 changes: 1 addition & 1 deletion lib/chef-cli/command/license.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def run(params)
remaining_args = parse_options(params)
return 1 unless validate_params!(remaining_args)

if remaining_args.blank?
if remaining_args.empty?
ChefCLI::Licensing::Base.validate
else
ChefCLI::Licensing::Base.send(remaining_args[0])
Expand Down