Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Commit

Permalink
Use compiled ruby on windows
Browse files Browse the repository at this point in the history
Windows devkit on windows only plz
  • Loading branch information
jkeiser committed Mar 4, 2016
1 parent e86b13b commit a02d923
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 26 deletions.
18 changes: 6 additions & 12 deletions omnibus/config/projects/chefdk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
install_dir "#{default_root}/#{name}"
end

override :ruby, version: "2.1.6"
override :'ruby-windows-devkit', version: "4.7.2-20130224" if windows? && windows_arch_i386?
override :bundler, version: "1.11.2"
override :rubygems, version: "2.5.2"

# Uncomment to pin the chef version
override :chef, version: "master"
override :ohai, version: "master"
Expand All @@ -48,9 +53,6 @@
override :chefspec, version: "master"
override :foodcritic, version: "v6.0.1"

override :bundler, version: "1.11.2"
override :rubygems, version: "2.5.2"

override :"chef-vault", version: "master"

# TODO: Can we bump default versions in omnibus-software?
Expand All @@ -59,15 +61,6 @@
# override :libxml2, version: "2.9.3"
override :libxslt, version: "1.1.28"

if windows?
override :'ruby-windows', version: "2.1.6"
if windows_arch_i386?
override :'ruby-windows-devkit', version: "4.7.2-20130224"
end
else
override :ruby, version: "2.1.6"
end

override :rubocop, version: "v0.37.2"

override :'kitchen-vagrant', version: "master"
Expand All @@ -92,6 +85,7 @@
dependency "chef-provisioning-fog"
dependency "chef-provisioning-vagrant"
dependency "chef-provisioning-azure"
dependency "ruby-windows-devkit" if windows?
dependency "rubygems-customization"
dependency "shebang-cleanup"
dependency "version-manifest"
Expand Down
2 changes: 1 addition & 1 deletion omnibus/config/software/chefdk-env-customization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

source path: "#{project.files_path}/#{name}"

dependency "ruby-windows"
dependency "ruby"

build do
block "Add chefdk_env_customization file" do
Expand Down
8 changes: 1 addition & 7 deletions omnibus/config/software/chefdk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,7 @@

relative_path "chef-dk"

if windows?
dependency "ruby-windows"
dependency "ruby-windows-devkit"
else
dependency "libffi" if debian?
dependency "ruby"
end
dependency "ruby"

dependency "rubygems"
dependency "bundler"
Expand Down
7 changes: 1 addition & 6 deletions omnibus/config/software/rubygems-customization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@

source path: "#{project.files_path}/#{name}"

if windows?
dependency "ruby-windows"
else
dependency "ruby"
end

dependency "ruby"
dependency "rubygems"

build do
Expand Down

0 comments on commit a02d923

Please sign in to comment.