summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerdar Sutay <serdarsutay@gmail.com>2016-08-22 14:49:04 -0700
committerSerdar Sutay <serdarsutay@gmail.com>2016-08-22 14:49:04 -0700
commit38ae78eab932855da169c07274c29630e10ac80d (patch)
tree09ee84836e2e50ee95c3f42b0804bfda797cdec4
parent17d1d617c573fe084810a11e542e125f44f7dfc2 (diff)
downloadchef-sersut/bundler-test.tar.gz
Testing the change to the bundler script in license_scout.sersut/bundler-test
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock3
-rw-r--r--omnibus/config/projects/chef.rb2
3 files changed, 5 insertions, 2 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 12b6171271..a5e618c298 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
gem "omnibus", github: "chef/omnibus", branch: "sersut/ff-ksubrama/gcc_investigate"
gem "omnibus-software", github: "chef/omnibus-software", branch: "sersut/ff-ksubrama/ruby23"
-gem "license_scout", github: "chef/license_scout"
+gem "license_scout", github: "chef/license_scout", branch: "sersut/robust-bundler"
# 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 .
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e3d0f24ead..e5d37b03cb 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,7 @@
GIT
remote: git://github.com/chef/license_scout.git
- revision: 3f33a3cb48cf4a796b2017a8fb25cf1cb22bf3ab
+ revision: bde4f04e257f8ff568ac29e3ddd0e0b6cd468af4
+ branch: sersut/robust-bundler
specs:
license_scout (0.1.0)
ffi-yajl (~> 2.2)
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 3d92d290a0..71da47c1a3 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -82,3 +82,5 @@ end
package :appx do
signing_identity "F74E1A68005E8A9C465C3D2FF7B41F3988F0EA09", machine_store: true
end
+
+# Simulating a clear cache build