diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-11-30 08:38:46 +0000 |
|---|---|---|
| committer | The Bundler Bot <bot@bundler.io> | 2017-11-30 08:38:46 +0000 |
| commit | 436853464ba9f35ac668cd454c6af20381c41ba7 (patch) | |
| tree | 302e954850c3cc386b7715154d80f8d1363b86dd | |
| parent | 778dcf58506b99fc7923a1ae530f1353dee9a4d4 (diff) | |
| parent | 284a9d684311ee3763387a46f7a4028b10107111 (diff) | |
| download | bundler-436853464ba9f35ac668cd454c6af20381c41ba7.tar.gz | |
Auto merge of #6195 - dr-itz:unbreak-warbler, r=segiddins
Include bundler.gemspec in the gem because warbler breaks w/o it
f06405 caused a regression with warbler, described in #6165 and jruby/warbler#421
If the fix is ok, it should probably be cherry-picked to 1-16-stable.
### What was the end-user problem that led to this PR?
Upgrading from bundler v1.15.x to v1.16.0 causes warbler to break/abort with error.
### What was your diagnosis of the problem?
1. error message from warbler: missing file
2. see why file is missing
3. google to see if it's just me 😄
### What is your fix for the problem, implemented in this PR?
Put the missing (from warblers point of view at least) back.
### Why did you choose this fix out of the possible options?
Seems easier than to fix warbler.
| -rw-r--r-- | bundler.gemspec | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bundler.gemspec b/bundler.gemspec index 6f0e583350..e3bfcb3539 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -49,6 +49,8 @@ Gem::Specification.new do |s| s.files += Dir.glob("man/**/*") # Include the CHANGELOG.md, LICENSE.md, README.md manually s.files += %w[CHANGELOG.md LICENSE.md README.md] + # include the gemspec itself because warbler breaks w/o it + s.files += %w[bundler.gemspec] s.bindir = "exe" s.executables = %w[bundle bundler] |