Skip to content

Commit

Permalink
Updating rake and minitest to version embedded in Ruby
Browse files Browse the repository at this point in the history
Also cleans up a rake error

Signed-off-by: tyler-ball <tball@chef.io>
  • Loading branch information
tyler-ball committed Apr 29, 2020
1 parent 739ab8b commit 42ab716
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions components/gems/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ group(:omnibus_package, :development, :test) do
# we pin these gems as they are installed in the ruby source and if we let them
# float we'll end up with 2 copies shipped in Workstation.
# When we bump Ruby we need to look at these pins and adjust them
gem "rake", "<= 12.3.2"
gem "minitest", "<= 5.11.3"
gem "rake", "= 13.0.1"
gem "minitest", "= 5.13.0"

gem "pry"
gem "yard"
Expand Down
8 changes: 4 additions & 4 deletions components/gems/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ GEM
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitar (0.9)
minitest (5.11.3)
minitest (5.13.0)
mixlib-archive (1.0.5)
mixlib-log
mixlib-archive (1.0.5-universal-mingw32)
Expand Down Expand Up @@ -742,7 +742,7 @@ GEM
r18n-core (= 4.0.0)
rack (2.2.2)
rainbow (3.0.0)
rake (12.3.2)
rake (13.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -1083,7 +1083,7 @@ DEPENDENCIES
knife-windows (>= 3.0.11)
listen
mdl (>= 0.7.0)
minitest (<= 5.11.3)
minitest (= 5.13.0)
mixlib-archive (>= 1.0)
mixlib-install
mixlib-versioning
Expand All @@ -1095,7 +1095,7 @@ DEPENDENCIES
pry-byebug
pry-remote
pry-stack_explorer
rake (<= 12.3.2)
rake (= 13.0.1)
rb-readline
rdp-ruby-wmi
ruby-prof
Expand Down
2 changes: 1 addition & 1 deletion components/gems/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ end
desc "Update the One True Gemfile.lock in this directory with the latest dependencies."
task :update do
require "bundler"
Bundler.with_clean_env do
Bundler.with_unbundled_env do
rm_f "Gemfile.lock"
sh "bundle _2.1.4_ lock --update --add-platform ruby x64-mingw32 x86-mingw32"
end
Expand Down
2 changes: 1 addition & 1 deletion omnibus/config/software/rubygems-customization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"#{project_dir}/default/operating_system.rb"
end

site_ruby = Bundler.with_clean_env do
site_ruby = Bundler.with_unbundled_env do
ruby = windows_safe_path("#{install_dir}/embedded/bin/ruby")
`#{ruby} -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']"`.strip
end
Expand Down
2 changes: 1 addition & 1 deletion omnibus/config/software/windows-env-customization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
block "Add windows env_customization file" do
source_customization_file = "#{project_dir}/windows/env_customization.rb"

site_ruby = Bundler.with_clean_env do
site_ruby = Bundler.with_unbundled_env do
ruby = windows_safe_path("#{install_dir}/embedded/bin/ruby")
`#{ruby} -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']"`.strip
end
Expand Down

0 comments on commit 42ab716

Please sign in to comment.