Skip to content
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

Jump to bottom

Test on Ruby 3 + fix ruby path in dockerfile #2528

Merged
merged 1 commit into from
Jan 20, 2022
Merged

Test on Ruby 3 + fix ruby path in dockerfile #2528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .expeditor/verify.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ expeditor:
automatic:
limit: 1
steps:
- label: chefstyle-tests-ruby-2.7
- label: chefstyle-tests-ruby-3.0
command:
- .expeditor/run_linux_tests.sh rake style
expeditor:
executor:
docker:
image: ruby:2.7-buster
image: ruby:3.0-buster
# This tests that our verify.rb script (and dependencies) can successfully test components included in CW
- label: component-test-tests-ruby-2.7
- label: component-test-tests-ruby-3.0
command:
- .expeditor/run_linux_tests.sh rspec omnibus/verification
expeditor:
executor:
docker:
image: ruby:2.7-buster
image: ruby:3.0-buster
- label: ":linux: :darwin: :windows: top-level chef cmd"
commands:
- cd components/main-chef-wrapper
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
ARG CHANNEL=stable
ARG VERSION=22.1.745
ENV DEBIAN_FRONTEND=noninteractive \
PATH=/opt/chef-workstation/bin:/opt/chef-workstation/embedded/bin:/root/.chefdk/gem/ruby/2.7.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PATH=/opt/chef-workstation/bin:/opt/chef-workstation/embedded/bin:/root/.chefdk/gem/ruby/3.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

# Run the entire container with the default locale to be en_US.UTF-8
RUN apt-get update && \
Expand Down
5 changes: 2 additions & 3 deletions components/gems/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ group(:omnibus_package) do
gem "kitchen-ec2", ">= 3.10"
gem "kitchen-digitalocean", ">= 0.13"
gem "kitchen-dokken", ">= 2.14"
gem "docker-api", ">= 2.0" # make sure we get the Ruby 2.7 compatible release
gem "docker-api", ">= 2.0" # make sure we get the Ruby 2.7+ compatible release
gem "kitchen-google", ">= 2.2"
gem "kitchen-hyperv", ">= 0.6"
gem "kitchen-inspec", ">= 2.5"
Expand Down Expand Up @@ -108,7 +108,6 @@ group(:omnibus_package) do
gem "pry", "= 0.13.0"
gem "pry-byebug"
gem "pry-remote"
# pry-stack_explorer 0.4.9.3 emits warnings under 2.7 under inspec shell
gem "pry-stack_explorer", ">= 0.5.1"
gem "rb-readline"
gem "winrm-fs"
Expand All @@ -133,7 +132,7 @@ platforms :mswin, :mingw do
gem "win32-dir"
gem "win32-event"
gem "win32-mutex"
gem "win32-process", ">= 0.9.0" # resolves Ruby 2.7 warnings
gem "win32-process", ">= 0.9.0" # resolves Ruby 2.7+ warnings
gem "win32-service", ">= 2.1.5" # 2.1.5 resolves ffi warnings
gem "win32-security" # remove this once https://github.com/eitoball/net-ping/pull/32 is merged
end