diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 470fb9a48..1bc03e8c1 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -11,54 +11,15 @@ expeditor: steps: -- label: run-specs-ruby-2.7 +- label: run-specs-ruby-3.3 command: - .expeditor/run_linux_tests.sh "rake spec" expeditor: executor: docker: - image: ruby:2.7 + image: ruby:3.3 -- label: run-specs-ruby-3.0 - command: - - .expeditor/run_linux_tests.sh "rake spec" - expeditor: - executor: - docker: - image: ruby:3.0 - -- label: run-specs-ruby-3.1 - command: - - .expeditor/run_linux_tests.sh "rake spec" - expeditor: - executor: - docker: - image: ruby:3.1 - - -- label: run-specs-ruby-2.7-windows - command: - - .expeditor/run_windows_tests.ps1 - expeditor: - executor: - docker: - host_os: windows - shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:2.7 - user: 'NT AUTHORITY\SYSTEM' - -- label: run-specs-ruby-3.0-windows - command: - - .expeditor/run_windows_tests.ps1 - expeditor: - executor: - docker: - host_os: windows - shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:3.0 - user: 'NT AUTHORITY\SYSTEM' - -- label: run-specs-ruby-3.1-windows +- label: run-specs-ruby-3.3-windows command: - .expeditor/run_windows_tests.ps1 expeditor: @@ -66,5 +27,5 @@ steps: docker: host_os: windows shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:3.1 + image: rubydistros/windows-2019:3.3 user: 'NT AUTHORITY\SYSTEM' \ No newline at end of file diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 7e5b422cc..48fba284e 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1 + ruby-version: 3.3 bundler-cache: true - uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR - run: bundle exec chefstyle @@ -37,10 +37,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up ruby 3.1 + - name: Set up ruby 3.3 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1 + ruby-version: 3.3 bundler-cache: true - name: run specs run: bundle exec rake spec --trace diff --git a/Gemfile b/Gemfile index 28401af41..31188c5c4 100644 --- a/Gemfile +++ b/Gemfile @@ -19,9 +19,9 @@ source "https://rubygems.org" gemspec group :development do - gem "chefstyle", "2.2.2" + gem "chefstyle", "2.2.3" gem "rake", ">= 10.1.0" - gem "rspec", "~> 3.0" + gem "rspec", "~> 3.12" gem "simplecov" end diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 4f2621c09..57ac6378b 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.description = "Ad-hoc management of individual nodes and devices." spec.homepage = "https://github.com/chef/chef-apply" spec.license = "Apache-2.0" - spec.required_ruby_version = ">= 2.7" + spec.required_ruby_version = ">= 3.3" spec.files = %w{Rakefile LICENSE warning.txt} + Dir.glob("Gemfile*") + # Includes Gemfile and locks @@ -49,7 +49,7 @@ Gem::Specification.new do |spec| spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI - spec.add_dependency "chef", ">= 16.0" # Needed to load cookbooks + spec.add_dependency "chef", "~> 18.0" spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3"