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
9 changes: 0 additions & 9 deletions .expeditor/build.habitat.yml

This file was deleted.

87 changes: 0 additions & 87 deletions .expeditor/buildkite/artifact.habitat.test.ps1

This file was deleted.

71 changes: 0 additions & 71 deletions .expeditor/buildkite/artifact.habitat.test.sh

This file was deleted.

27 changes: 2 additions & 25 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ rubygems:
- chef-cli

release_branches:
- workstation-LTS:
version_constraint: 1.*
- main:
version_constraint: 5.*

Expand All @@ -28,27 +30,10 @@ github:
changelog:
rollup_header: Changes not yet released to rubygems.org

artifact_channels:
- unstable
- chef-dke-lts2024

pipelines:
- verify:
description: Pull Request validation tests
public: true
- habitat/build:
env:
- HAB_NONINTERACTIVE: "true"
- HAB_NOCOLORING: "true"
- HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
- habitat/test:
description: Execute tests against the habitat artifact
definition: .expeditor/habitat-test.pipeline.yml
env:
- HAB_NONINTERACTIVE: "true"
- HAB_NOCOLORING: "true"
- HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
trigger: pull_request

subscriptions:
# These actions are taken, in order they are specified, anytime a Pull Request is merged.
Expand All @@ -66,15 +51,7 @@ subscriptions:
- "Expeditor: Skip All"
- built_in:build_gem:
only_if: built_in:bump_version
- trigger_pipeline:habitat/build:
only_if: built_in:bump_version
ignore_labels:
- "Expeditor: Skip Habitat"
- "Expeditor: Skip All"

# this works for symantec version promote
- workload: project_promoted:{{agent_id}}:*
actions:
- built_in:rollover_changelog
- built_in:promote_habitat_packages
- built_in:publish_rubygems
36 changes: 0 additions & 36 deletions .expeditor/habitat-test.pipeline.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,3 @@ Vagrantfile
my-cookbook
results/
Gemfile.lock


.idea/
14 changes: 2 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
<!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/#common-changelog -->
<!-- latest_release 5.6.18 -->
## [v5.6.18](https://github.com/chef/chef-cli/tree/v5.6.18) (2025-02-18)

#### Merged Pull Requests
- Linking of ruby and bin path change in hab: [#265](https://github.com/chef/chef-cli/pull/265) ([sanghinitin](https://github.com/sanghinitin))
<!-- latest_release -->
<!-- latest_release -->

<!-- release_rollup since=5.6.16 -->
### Changes not yet released to rubygems.org

#### Merged Pull Requests
- Linking of ruby and bin path change in hab: [#265](https://github.com/chef/chef-cli/pull/265) ([sanghinitin](https://github.com/sanghinitin)) <!-- 5.6.18 -->
- Habitat Package for Chef-CLI [#260](https://github.com/chef/chef-cli/pull/260) ([nikhil2611](https://github.com/nikhil2611)) <!-- 5.6.17 -->
- Add hab promote pipeline [#254](https://github.com/chef/chef-cli/pull/254) ([sanghinitin](https://github.com/sanghinitin)) <!-- 0.1.0 -->
<!-- release_rollup -->
<!-- release_rollup -->

<!-- latest_stable_release -->
Expand Down
18 changes: 7 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,26 @@ source "https://rubygems.org"
gemspec

gem "logger", "< 1.6" # 1.6 causes errors with mixlib-log < 3.1.1
gem "chefspec"

group :test do
gem "rake"
gem "rspec", "=3.12.0"
gem "rspec", "~> 3.8"
gem "rspec-expectations", "~> 3.8"
gem "rspec-mocks", "~> 3.8"
gem "cookstyle"
gem "chefstyle"
gem "faraday_middleware"
gem "chef-test-kitchen-enterprise", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main"
gem "test-kitchen"
gem "simplecov", require: false
end

group :development do
gem "pry"
gem "pry-byebug"
gem "rb-readline"
gem "appbundler"
end

group :profile do
unless RUBY_PLATFORM.match?(/mswin|mingw|windows/)
gem "stackprof"
gem "stackprof-webnav"
gem "memory_profiler"
end
end
gem "stackprof"
gem "stackprof-webnav"
gem "memory_profiler"
end
3 changes: 0 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
require "bundler/gem_tasks"

namespace :style do
begin
Expand Down Expand Up @@ -54,4 +52,3 @@ namespace :style do
puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
end
end

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.6.18
5.6.16
1 change: 0 additions & 1 deletion chef-cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@ Gem::Specification.new do |gem|
gem.add_dependency "diff-lcs", ">= 1.0", "< 1.4" # 1.4 changes the output
gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ
gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
gem.add_dependency "chef-licensing", "~> 1.0"
end
Loading
Loading