diff options
| author | John Keiser <john@johnkeiser.com> | 2016-04-17 09:34:29 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-04-18 14:21:02 -0700 |
| commit | 01cf3ef2a85d3190b0bd46835ff6ae37f830764a (patch) | |
| tree | b15fc1934d56c4449101b10d074b72e26a4884e3 /Gemfile.windows | |
| parent | 31f9ada8660a2831204aca436e343b6a10b103cd (diff) | |
| download | chef-01cf3ef2a85d3190b0bd46835ff6ae37f830764a.tar.gz | |
Remove Gemfile.windows and put both platforms in Gemfile.lock
Diffstat (limited to 'Gemfile.windows')
| -rw-r--r-- | Gemfile.windows | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/Gemfile.windows b/Gemfile.windows deleted file mode 100644 index def7a0bff6..0000000000 --- a/Gemfile.windows +++ /dev/null @@ -1,41 +0,0 @@ -# -# We ensure everything in windows is pinned to the same version as "generic" -# by reading the generic Gemfile.lock and pinning to that version in the Gemfile. -# -# This could *almost* be accomplished by simply copying the lockfile and doing a -# `bundle install` to add any windows dependencies, but bundler can still update -# existing versions in a couple of cases: -# -# 1. When the source has changed since the main lockfile was built. -# 2. When Windows-specific dependencies constrain our solution. -# -# We do NOT allow windows gem versions to differ from non-windows, so that our -# packages are consistent across operating systems. -# -# At the end of this process, this `Gemfile`: -# -# ``` -# gem 'chef', github: 'chef/chef' -# gem 'berkshelf' -# ``` -# -# Is transformed to something like this: -# -# ``` -# gem 'chef', github: 'chef/chef', ref: '23049723984237948023' -# gem 'berkshelf', '= 2.0.5' -# gem 'ohai', '= 12.9.30' # implicit dependency of chef -# ``` -# - -require_relative "tasks/gemfile_util" -extend GemfileUtil - -# Honor the main gem's lockfile -include_locked_gemfile("Gemfile", without_groups: [ :aix, :bsd, :mac_os_x, :linux, :solaris ], copy_groups: true) - -# We have the same deps as the main Gemfile (except since we're Windows, we read the -# chef-windows.gemspec instead of chef.gemspec) -$chef_platform = "windows" -chef_gemfile = File.expand_path("../Gemfile", __FILE__) -instance_eval(IO.read(chef_gemfile), chef_gemfile) |