Skip to content

Commit 249be93

Browse files
muthujanikhil2611
andauthored
build chef-cli against to base 2025 (#294)
* build chef-cli against to base 2025 Signed-off-by: muthuja <[email protected]> * build chef-cli against to base 2025 Signed-off-by: muthuja <[email protected]> * modify pkg dep pull from core/ruby Signed-off-by: muthuja <[email protected]> * use ruby 3.4 image Signed-off-by: muthuja <[email protected]> * updated from blank? to empty? Signed-off-by: nikhil2611 <[email protected]> --------- Signed-off-by: muthuja <[email protected]> Signed-off-by: nikhil2611 <[email protected]> Co-authored-by: nikhil2611 <[email protected]>
1 parent 7359e48 commit 249be93

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

.expeditor/buildkite/artifact.habitat.test.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# TODO: Set-StrictMode -Version Latest
66
$PSDefaultParameterValues['*:ErrorAction']='Stop'
77
$ErrorActionPreference = 'Stop'
8-
$env:HAB_BLDR_CHANNEL = "LTS-2024"
9-
$env:HAB_REFRESH_CHANNEL = "LTS-2024"
8+
$env:HAB_BLDR_CHANNEL = "base-2025"
9+
$env:HAB_REFRESH_CHANNEL = "base-2025"
1010
$env:CHEF_LICENSE = 'accept-no-persist'
1111
$env:HAB_LICENSE = 'accept-no-persist'
1212
$Plan = 'chef-cli'
@@ -61,7 +61,6 @@ finally {
6161
Write-Host "HAB_ORIGIN set to 'ci' after installation."
6262
$env:HAB_ORIGIN = 'ci'
6363

64-
6564
Write-Host "--- Generating fake origin key"
6665
hab origin key generate $env:HAB_ORIGIN
6766

.expeditor/buildkite/artifact.habitat.test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ echo "--- Installing Habitat"
4040
id -a
4141
curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash
4242

43-
# Set HAB_ORIGIN after Habitat installation
4443
echo "--- Setting HAB_ORIGIN to 'ci' after installation"
4544
export HAB_ORIGIN='ci'
4645

.expeditor/habitat-test.pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ steps:
2929
docker:
3030
host_os: windows
3131
shell: ["powershell", "-Command"]
32-
image: rubydistros/windows-2019:3.1
32+
image: rubydistros/windows-2019:3.4
3333
user: 'NT AUTHORITY\SYSTEM'
3434
environment:
3535
- HAB_AUTH_TOKEN

habitat/plan.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
$ErrorActionPreference = "Stop"
22
$PSDefaultParameterValues['*:ErrorAction']='Stop'
33

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

1111
$pkg_deps=@(
12-
"chef/ruby31-plus-devkit"
12+
"core/ruby3_4-plus-devkit"
1313
"core/git"
1414
)
1515
$pkg_bin_dirs=@("bin"

lib/chef-cli/command/license.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def run(params)
7070
remaining_args = parse_options(params)
7171
return 1 unless validate_params!(remaining_args)
7272

73-
if remaining_args.blank?
73+
if remaining_args.empty?
7474
ChefCLI::Licensing::Base.validate
7575
else
7676
ChefCLI::Licensing::Base.send(remaining_args[0])

0 commit comments

Comments
 (0)