summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-03-20 10:28:20 +0000
committerThom May <thom@chef.io>2017-03-20 10:28:20 +0000
commitf75d150357899bc94a8ab96c380cf5a735e6ec9c (patch)
tree55d3efee2b45e0c53bf62231752df8e6d582a0ab
parenta1f9544e2ad149febbdd3e9acaacfec0323c20dd (diff)
downloadchef-tm/test_omnibus_fix.tar.gz
test that proper path globbing fixes the chef windows buildtm/test_omnibus_fix
Signed-off-by: Thom May <thom@may.lt>
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock13
2 files changed, 8 insertions, 7 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 652a6e69b8..0300265d98 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "tm/safe_glob"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software"
gem "license_scout", git: "https://github.com/chef/license_scout"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 20eb83adec..9612b216ca 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,7 +8,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus
- revision: 76d907f4fe92a28c5f7ab11779341e1d773c358d
+ revision: 1ecfbc6781ea29fc24c5c979f5bff7b7f646dcea
+ branch: tm/safe_glob
specs:
omnibus (5.5.0)
aws-sdk (~> 2)
@@ -37,13 +38,13 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
artifactory (2.7.0)
awesome_print (1.7.0)
- aws-sdk (2.8.5)
- aws-sdk-resources (= 2.8.5)
- aws-sdk-core (2.8.5)
+ aws-sdk (2.8.7)
+ aws-sdk-resources (= 2.8.7)
+ aws-sdk-core (2.8.7)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.8.5)
- aws-sdk-core (= 2.8.5)
+ aws-sdk-resources (2.8.7)
+ aws-sdk-core (= 2.8.7)
aws-sigv4 (1.0.0)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)