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

Following up ruby core changes. #6818

Merged
1 commit merged into from
Dec 1, 2018
Merged

Following up ruby core changes. #6818

1 commit merged into from
Dec 1, 2018

Conversation

hsbt
Copy link
Member

@hsbt hsbt commented Nov 28, 2018

What is your fix for the problem, implemented in this PR?

These changes enabled to use the same configuration of executables in ruby core repository.

  • To use libexec instead of bin directory.
  • Restore exe direcotry for bundler.gemspec while running test suite.

Why did you choose this fix out of the possible options?

The ruby core repository uses exe directory for other usage. I chose libexec instead of exe in ruby core. And, The location of bundler.gemspec is not the root of the repository on ruby core. We should restore libexec to exe under the lib dir.

see. https://github.com/ruby/ruby/blob/trunk/lib/bundler.gemspec

  * To use libexec instead of bin directory.
  * Restore exe direcotry for bundler.gemspec while running test suite.
@hsbt
Copy link
Member Author

hsbt commented Dec 1, 2018

@bundlerbot r+

ghost pushed a commit that referenced this pull request Dec 1, 2018
6818: Following up ruby core changes. r=hsbt a=hsbt

### What is your fix for the problem, implemented in this PR?

These changes enabled to use the same configuration of executables in ruby core repository.

  * To use libexec instead of bin directory.
  * Restore exe direcotry for bundler.gemspec while running test suite.

### Why did you choose this fix out of the possible options?

The ruby core repository uses `exe` directory for other usage. I chose `libexec` instead of `exe` in ruby core. And, The location of `bundler.gemspec` is not the root of the repository on ruby core. We should restore `libexec` to `exe` under the `lib` dir.

see. https://github.com/ruby/ruby/blob/trunk/lib/bundler.gemspec

Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
@ghost
Copy link

ghost commented Dec 1, 2018

Build succeeded

@ghost ghost merged commit 0942a9c into master Dec 1, 2018
@ghost ghost deleted the backport-ruby-core branch December 1, 2018 01:26
@hsbt hsbt added this to the 2.0.0 milestone Dec 3, 2018
colby-swandale pushed a commit that referenced this pull request Dec 4, 2018
6818: Following up ruby core changes. r=hsbt a=hsbt

### What is your fix for the problem, implemented in this PR?

These changes enabled to use the same configuration of executables in ruby core repository.

  * To use libexec instead of bin directory.
  * Restore exe direcotry for bundler.gemspec while running test suite.

### Why did you choose this fix out of the possible options?

The ruby core repository uses `exe` directory for other usage. I chose `libexec` instead of `exe` in ruby core. And, The location of `bundler.gemspec` is not the root of the repository on ruby core. We should restore `libexec` to `exe` under the `lib` dir.

see. https://github.com/ruby/ruby/blob/trunk/lib/bundler.gemspec

Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit a578c4e)
hsbt pushed a commit that referenced this pull request Dec 11, 2018
6818: Following up ruby core changes. r=hsbt a=hsbt

### What is your fix for the problem, implemented in this PR?

These changes enabled to use the same configuration of executables in ruby core repository.

  * To use libexec instead of bin directory.
  * Restore exe direcotry for bundler.gemspec while running test suite.

### Why did you choose this fix out of the possible options?

The ruby core repository uses `exe` directory for other usage. I chose `libexec` instead of `exe` in ruby core. And, The location of `bundler.gemspec` is not the root of the repository on ruby core. We should restore `libexec` to `exe` under the `lib` dir.

see. https://github.com/ruby/ruby/blob/trunk/lib/bundler.gemspec

Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit a578c4e)
(cherry picked from commit 1871506)
colby-swandale added a commit that referenced this pull request Dec 11, 2018
* 1-17-stable:
  Version 1.17.2 with changelog
  Merge #6798
  Merge #6818
  Merge #6786
  Merge #6743
  Merge #6742
  Merge #6740
  Merge #6834
  Merge pull request #6752 from bundler/indirect/backport-6737
colby-swandale added a commit that referenced this pull request Jan 4, 2019
* 2-0-stable: (39 commits)
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  bump bundler_2_mode in inject spec
  Version 2.0.0.pre.2 with Changelog
  fix failing major deprecation error spec
  remove :github source declaration from new gem template
  ...
colby-swandale added a commit that referenced this pull request Feb 10, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...
colby-swandale added a commit that referenced this pull request Feb 12, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...
colby-swandale added a commit that referenced this pull request Feb 18, 2019
1
* commit '77f4c15451aaac135d19ac5d1637981d7b05d799': (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...
colby-swandale added a commit that referenced this pull request Feb 20, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...

(cherry picked from commit 77f4c15)
deivid-rodriguez pushed a commit that referenced this pull request Feb 28, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...

(cherry picked from commit 77f4c15)
deivid-rodriguez pushed a commit that referenced this pull request Mar 13, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...

(cherry picked from commit 77f4c15)
deivid-rodriguez pushed a commit that referenced this pull request Mar 13, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...

(cherry picked from commit 77f4c15)
deivid-rodriguez pushed a commit that referenced this pull request Mar 15, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...

(cherry picked from commit 77f4c15)
deivid-rodriguez pushed a commit that referenced this pull request Mar 20, 2019
* 2-0-stable: (43 commits)
  remove path that i copied from my personal computer
  Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect
  Merge #6941
  Merge #6834
  Version 2.0.1 with changelog
  update tested rubygems in travis
  Lower required RubyGems to 2.5 or greater
  Bundler 2.0 with changelog
  update CHANGELOG with new changes and release
  Merge #6856
  add RubyGems v3.0.1 to rg clone task
  Version 2.0.0.pre.3 wih changelog
  update tested versions of RubyGems in travis
  update gemspec to require RubyGems 3.0.0
  Merge #6849
  Merge #6853
  Revert "Version 2.0.0 with changelog"
  Version 2.0.0 with changelog
  fix breaking edge case spec
  Merge #6818
  ...

(cherry picked from commit 77f4c15)
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants