Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix underscore version selection for bundler #2908

Merged
1 commit merged into from
Sep 25, 2019

Conversation

deivid-rodriguez
Copy link
Member

@deivid-rodriguez deivid-rodriguez commented Sep 10, 2019

Description:

When rubygems' underscore version selection is used with bundler itself, it doesn't work. This PR should fix it.

Tasks:

  • Describe the problem / feature
  • Write tests
  • Write code to solve the problem
  • Get code review from coworkers / friends

I will abide by the code of conduct.

Fixes rubygems/bundler#7345.
Closes rubygems/bundler#7349.

@hsbt hsbt added this to the 3.0.7 milestone Sep 11, 2019
@deivid-rodriguez deivid-rodriguez force-pushed the underscores_vs_bundler_version_finder branch 2 times, most recently from 362d70a to 894a224 Compare September 11, 2019 10:20
Previously it wouldn't play nice with the bundler version finder.
@deivid-rodriguez deivid-rodriguez force-pushed the underscores_vs_bundler_version_finder branch from a641da4 to d8bb815 Compare September 18, 2019 11:02
@deivid-rodriguez
Copy link
Member Author

I added a test for this fix. "MacOS 2.3.x" check failed initially but I think it was unrelated, so I restarted it and it's now green.

The main benefit of this fix is that it allows users to easily skip the "BUNDLED WITH" automatic bundler version locking by specifying the desired version surrounded by underscores (bundle _1.17.3_ install, or whatever), just like with any other rubygems binstub.

Copy link
Member

@hsbt hsbt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. I got the same issue on my box.

@hsbt
Copy link
Member

hsbt commented Sep 24, 2019

@bundlerbot r+

ghost pushed a commit that referenced this pull request Sep 24, 2019
2906: Backport ruby core r=hsbt a=hsbt

# Description:

Fixed the warnings with keyword separation feature of Ruby 2.7 and rondomly failed on GitHub Actions.
______________

# Tasks:

- [ ] Describe the problem / feature
- [ ] Write tests
- [ ] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).


2908: Fix underscore version selection for bundler r=hsbt a=deivid-rodriguez

# Description:

When rubygems' underscore version selection is used with bundler itself, it doesn't work. This PR should fix it.

# Tasks:

- [x] Describe the problem / feature
- [x] Write tests
- [x] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).

Fixes rubygems/bundler#7345.
Closes rubygems/bundler#7349.

Co-authored-by: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Co-authored-by: Jeremy Evans <code@jeremyevans.net>
Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
@ghost
Copy link

ghost commented Sep 24, 2019

Build failed (retrying...)

ghost pushed a commit that referenced this pull request Sep 24, 2019
2908: Fix underscore version selection for bundler r=hsbt a=deivid-rodriguez

# Description:

When rubygems' underscore version selection is used with bundler itself, it doesn't work. This PR should fix it.

# Tasks:

- [x] Describe the problem / feature
- [x] Write tests
- [x] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).

Fixes rubygems/bundler#7345.
Closes rubygems/bundler#7349.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
@ghost
Copy link

ghost commented Sep 24, 2019

Build failed

@hsbt
Copy link
Member

hsbt commented Sep 25, 2019

@bundlerbot retry

ghost pushed a commit that referenced this pull request Sep 25, 2019
2906: Backport ruby core r=hsbt a=hsbt

# Description:

Fixed the warnings with keyword separation feature of Ruby 2.7 and rondomly failed on GitHub Actions.
______________

# Tasks:

- [ ] Describe the problem / feature
- [ ] Write tests
- [ ] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).


2908: Fix underscore version selection for bundler r=hsbt a=deivid-rodriguez

# Description:

When rubygems' underscore version selection is used with bundler itself, it doesn't work. This PR should fix it.

# Tasks:

- [x] Describe the problem / feature
- [x] Write tests
- [x] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).

Fixes rubygems/bundler#7345.
Closes rubygems/bundler#7349.

Co-authored-by: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Co-authored-by: Jeremy Evans <code@jeremyevans.net>
Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
@ghost
Copy link

ghost commented Sep 25, 2019

Build succeeded

@ghost ghost merged commit d8bb815 into master Sep 25, 2019
@ghost ghost deleted the underscores_vs_bundler_version_finder branch September 25, 2019 08:29
hsbt pushed a commit that referenced this pull request Feb 18, 2020
2906: Backport ruby core r=hsbt a=hsbt

# Description:

Fixed the warnings with keyword separation feature of Ruby 2.7 and rondomly failed on GitHub Actions.
______________

# Tasks:

- [ ] Describe the problem / feature
- [ ] Write tests
- [ ] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).

2908: Fix underscore version selection for bundler r=hsbt a=deivid-rodriguez

# Description:

When rubygems' underscore version selection is used with bundler itself, it doesn't work. This PR should fix it.

# Tasks:

- [x] Describe the problem / feature
- [x] Write tests
- [x] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).

Fixes rubygems/bundler#7345.
Closes rubygems/bundler#7349.

Co-authored-by: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Co-authored-by: Jeremy Evans <code@jeremyevans.net>
Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
hsbt pushed a commit that referenced this pull request Feb 18, 2020
2906: Backport ruby core r=hsbt a=hsbt

# Description:

Fixed the warnings with keyword separation feature of Ruby 2.7 and rondomly failed on GitHub Actions.
______________

# Tasks:

- [ ] Describe the problem / feature
- [ ] Write tests
- [ ] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).

2908: Fix underscore version selection for bundler r=hsbt a=deivid-rodriguez

# Description:

When rubygems' underscore version selection is used with bundler itself, it doesn't work. This PR should fix it.

# Tasks:

- [x] Describe the problem / feature
- [x] Write tests
- [x] Write code to solve the problem
- [ ] Get code review from coworkers / friends

I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).

Fixes rubygems/bundler#7345.
Closes rubygems/bundler#7349.

Co-authored-by: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Co-authored-by: Jeremy Evans <code@jeremyevans.net>
Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants