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

Commit

Permalink
Use fixed xslt branch to compile on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
jkeiser committed Apr 7, 2016
1 parent 168233f commit 27a4020
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
20 changes: 10 additions & 10 deletions omnibus/Gemfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gem 'omnibus', git: 'https://github.com/chef/omnibus.git'
gem 'omnibus-software', git: 'https://github.com/chef/omnibus-software.git'
gem "omnibus", git: "https://github.com/chef/omnibus.git"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git", ref: "c69fa3a0b3df1e202e3f829596999c13c1d3b8e3"

# `json_pure` has a bug in it that is failing ChefDK builds. We include the
# json gem into the Gemfile so that running `bundle exec` will have
# this gem on the load path, and cause `require 'json/ext'` to succeed. This
# this gem on the load path, and cause `require "json/ext"` to succeed. This
# prevents loading the `json_pure` gem
gem 'json', '>= 1.8.1'
gem "json", ">= 1.8.1"

# pedump pessimistically pins multipart-post to a version from 2013 which makes
# bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 .
gem 'pedump', git: 'https://github.com/ksubrama/pedump.git', branch: 'patch-1'
gem "pedump", git: "https://github.com/ksubrama/pedump.git", branch: "patch-1"

# This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need
# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
# by running `bundle install --without development` to speed up build times.
group :development do
# Use Berkshelf for resolving cookbook dependencies
gem 'berkshelf'
gem "berkshelf"

# Use Test Kitchen with Vagrant for converging the build environment
gem 'test-kitchen'
gem 'kitchen-vagrant'
gem 'winrm-fs'
gem "test-kitchen"
gem "kitchen-vagrant"
gem "winrm-fs"
end
3 changes: 2 additions & 1 deletion omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 5eaa3a79fc25f738a12c60f5dd9f0ce3a48bce9f
revision: c69fa3a0b3df1e202e3f829596999c13c1d3b8e3
ref: c69fa3a0b3df1e202e3f829596999c13c1d3b8e3
specs:
omnibus-software (4.0.0)
omnibus (>= 5.2.0)
Expand Down

0 comments on commit 27a4020

Please sign in to comment.