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.

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

[SHACK-140] Updating our ruby version to 2.5 to be on the latest #75

Merged
merged 1 commit into from
Apr 12, 2018
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
# parallelism: 3
docker:
- image: circleci/ruby:2.4
- image: circleci/ruby:2.5
steps:
- checkout
# Restore bundle cache
Expand Down
2 changes: 0 additions & 2 deletions components/chef-workstation/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ gem "train", git: "https://github.com/chef/train", branch: "master"

group :localdev do
gem "irbtools-more", require: "irbtools/binding"
# 1.2.0 requires Ruby 2.5.0 which isn't released yet
gem "did_you_mean", ">= 1.1.2", "< 1.2.0"
end
13 changes: 6 additions & 7 deletions components/chef-workstation/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
aws-sdk (2.11.32)
aws-sdk-resources (= 2.11.32)
aws-sdk-core (2.11.32)
aws-sdk (2.11.33)
aws-sdk-resources (= 2.11.33)
aws-sdk-core (2.11.33)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.32)
aws-sdk-core (= 2.11.32)
aws-sdk-resources (2.11.33)
aws-sdk-core (= 2.11.33)
aws-sigv4 (1.0.2)
azure_mgmt_resources (0.16.0)
ms_rest_azure (~> 0.10.0)
Expand Down Expand Up @@ -110,7 +110,7 @@ GEM
debugging (1.1.1)
binding.repl (~> 3.0)
paint (>= 0.9, < 3.0)
did_you_mean (1.1.2)
did_you_mean (1.2.1)
diff-lcs (1.3)
docker-api (1.34.2)
excon (>= 0.47.0)
Expand Down Expand Up @@ -352,7 +352,6 @@ DEPENDENCIES
bundler
chef-workstation!
chefstyle
did_you_mean (>= 1.1.2, < 1.2.0)
irbtools-more
pry
pry-byebug
Expand Down
1 change: 1 addition & 0 deletions components/chef-workstation/chef-workstation.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
spec.description = "Manage individual nodes or the complete Chef ecosystem."
spec.homepage = "https://github.com/chef/chef-workstation/components/chef"
spec.license = "Apache-2.0"
spec.required_ruby_version = ">= 2.5.0"

# Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
# to allow pushing to a single host or delete this section to allow pushing to any host.
Expand Down
30 changes: 15 additions & 15 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 3f6f9836cb041ad6187b7b52a25cf759fc830bc6
revision: 71f7f900cddf62c3c1260ec3885a029e1f2193d9
branch: lcg/appbundle-0.11-without
specs:
omnibus-software (4.0.0)
Expand All @@ -9,10 +9,10 @@ GIT

GIT
remote: https://github.com/chef/omnibus.git
revision: bc76c699bc8b85959bb546933efa6b5cf0ff1823
revision: 5bc3a48f9210c19f9b84371d6037447739c96bd8
branch: lcg/improve-appbundling
specs:
omnibus (5.6.10)
omnibus (5.6.11)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
Expand All @@ -31,18 +31,18 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-sdk (2.11.19)
aws-sdk-resources (= 2.11.19)
aws-sdk-core (2.11.19)
aws-sdk (2.11.33)
aws-sdk-resources (= 2.11.33)
aws-sdk-core (2.11.33)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.19)
aws-sdk-core (= 2.11.19)
aws-sdk-resources (2.11.33)
aws-sdk-core (= 2.11.33)
aws-sigv4 (1.0.2)
berkshelf (6.3.1)
berkshelf (6.3.2)
buff-config (~> 2.0)
buff-extensions (~> 2.0)
chef (>= 12.7.2)
chef (>= 12.7.2, < 14.0)
cleanroom (~> 1.0)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
Expand All @@ -66,7 +66,7 @@ GEM
buff-shell_out (1.1.0)
buff-ruby_engine (~> 1.0)
builder (3.2.3)
byebug (10.0.1)
byebug (10.0.2)
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.2)
Expand Down Expand Up @@ -140,7 +140,7 @@ GEM
iostruct (0.0.4)
ipaddress (0.8.3)
iso8601 (0.9.1)
jmespath (1.3.1)
jmespath (1.4.0)
json (2.1.0)
kitchen-vagrant (1.3.1)
test-kitchen (~> 1.4)
Expand Down Expand Up @@ -168,7 +168,7 @@ GEM
mixlib-log (1.7.1)
mixlib-shellout (2.3.2)
mixlib-versioning (1.2.2)
molinillo (0.6.4)
molinillo (0.6.5)
multi_json (1.13.1)
multipart-post (2.0.0)
net-scp (1.2.1)
Expand All @@ -186,7 +186,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (13.8.0)
ohai (13.9.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand Down Expand Up @@ -272,7 +272,7 @@ GEM
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
specinfra (2.73.2)
specinfra (2.73.3)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
Expand Down
4 changes: 2 additions & 2 deletions omnibus/config/projects/chef-workstation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
build_iteration 1

override :bundler, version: "1.16.1"
override :rubygems, version: "2.6.13"
override :ruby, version: "2.4.2"
override :rubygems, version: "2.7.6"
override :ruby, version: "2.5.1"

dependency "preparation"
dependency "chef-workstation"
Expand Down