Skip to content

Upgrade ruby to 3.3 #225

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

Open
nikhil2611 wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Upgrade ruby to 3.3 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
706c3d9
added the ruby 3.3 pipeline and remove older ruby ones
nikhil2611 Jul 10, 2024
13998a2
updated pipeline and gems
nikhil2611 Jul 12, 2024
cd93a9a
updated chef gems
nikhil2611 Jul 12, 2024
2c2b79d
updated rspec version
nikhil2611 Jul 13, 2024
771c87e
updated rspec version
nikhil2611 Jul 14, 2024
c19395e
updated the timeout
nikhil2611 Jul 18, 2024
a1af451
reverted back the timeout to 30
nikhil2611 Jul 18, 2024
56dc73c
updated the pipeline to 3.3
nikhil2611 Jul 21, 2024
90f77e9
updated the ruby to 3.3 in gemspec
nikhil2611 Jul 22, 2024
5fb4548
updated ruby version condition
nikhil2611 Jul 23, 2024
7f1a1ae
updated ruby version condition
nikhil2611 Jul 23, 2024
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
47 changes: 4 additions & 43 deletions .expeditor/verify.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,60 +11,21 @@ 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:
executor:
docker:
host_os: windows
shell: ["powershell", "-Command"]
image: rubydistros/windows-2019:3.1
image: rubydistros/windows-2019:3.3
user: 'NT AUTHORITY\SYSTEM'
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions chef-apply.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down