Skip to content

Commit

Permalink
bump Ruby to 2.6.5, update gems with deprecations
Browse files Browse the repository at this point in the history
Signed-off-by: Robb Kidd <rkidd@chef.io>
  • Loading branch information
robbkidd committed Mar 4, 2020
1 parent dd58c84 commit 16e5d99
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:

language: ruby
rvm:
- 2.5.3
- 2.6.5
bundler_args: "--without development --jobs 7"

notifications:
Expand All @@ -52,7 +52,7 @@ matrix:
- redis-server
- postgresql
before_install:
- gem install bundler --no-ri --no-rdoc
- gem install bundler --no-document
- cd $TRAVIS_BUILD_DIR/src/$NAME && bundle config build.nokogiri --use-system-libraries
before_script:
- psql -c 'create database supermarket_test;' -U postgres
Expand All @@ -77,7 +77,7 @@ matrix:
- redis-server
- postgresql
before_install:
- gem install bundler --no-ri --no-rdoc
- gem install bundler --no-document
- cd $TRAVIS_BUILD_DIR/src/supermarket/engines/$NAME && bundle config build.nokogiri --use-system-libraries
script:
- cd $TRAVIS_BUILD_DIR/src/supermarket/engines/$NAME
Expand Down
2 changes: 1 addition & 1 deletion omnibus/config/projects/supermarket.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
build_iteration 1

override :postgresql, version: '9.3.18'
override :ruby, version: "2.5.3"
override :ruby, version: "2.6.5"
override :rubygems, version: "3.0.3" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which makes the omnibus environment unhappy. Make sure these versions match before bumping either.
override :bundler, version: "1.17.3" # this must match the BUNDLED WITH in all the repo's Gemfile.locks
override :'chef-gem', version: '14.5.33'
Expand Down
26 changes: 13 additions & 13 deletions src/supermarket/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ GEM
brakeman (3.6.1)
builder (3.2.3)
byebug (9.0.6)
capybara (2.14.0)
capybara (2.18.0)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
xpath (>= 2.0, < 4.0)
capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3)
launchy
Expand Down Expand Up @@ -234,7 +234,7 @@ GEM
guard-rubocop (1.2.0)
guard (~> 2.0)
rubocop (~> 0.20)
hashdiff (0.3.4)
hashdiff (1.0.1)
hashie (3.6.0)
highline (1.7.10)
html_truncator (0.4.1)
Expand Down Expand Up @@ -287,9 +287,9 @@ GEM
mail_view (2.0.4)
tilt
method_source (0.8.2)
mime-types (3.2.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mime-types-data (3.2019.1009)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
Expand Down Expand Up @@ -396,7 +396,7 @@ GEM
slop (~> 3.4)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.3)
public_suffix (3.1.1)
pundit (1.1.0)
activesupport (>= 3.0.0)
raabro (1.1.6)
Expand Down Expand Up @@ -498,7 +498,7 @@ GEM
ruby_dep (1.5.0)
rubyzip (2.0.0)
rufus-lru (1.1.0)
safe_yaml (1.0.4)
safe_yaml (1.0.5)
sass (3.4.24)
sass-globbing (1.1.5)
sass (>= 3.1)
Expand Down Expand Up @@ -564,7 +564,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.0)
unicode-display_width (1.6.1)
unicorn (5.4.0)
kgio (~> 2.6)
raindrops (~> 0.7)
Expand All @@ -583,18 +583,18 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0.3)
equalizer (~> 0.0.9)
webmock (3.0.1)
webmock (3.8.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
with_env (1.1.0)
wmi-lite (1.0.0)
xml-simple (1.1.5)
xpath (2.0.0)
nokogiri (~> 1.3)
xpath (3.2.0)
nokogiri (~> 1.8)
yajl-ruby (1.3.1)
yard (0.9.20)

Expand Down
2 changes: 1 addition & 1 deletion src/supermarket/engines/fieri/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ GEM
polyglot (~> 0.3)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.3.0)
unicode-display_width (1.6.1)
webmock (3.0.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
Expand Down

0 comments on commit 16e5d99

Please sign in to comment.