Skip to content

(chore) Git ignore lockfiles in gemfiles/ #55

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

Merged
merged 1 commit into from
Mar 26, 2020

Conversation

olleolleolle
Copy link
Contributor

This PR adds an ignore pattern to help developers not commit lockfiles for the gemfiles/ directory either.

We already had a pattern for the root Gemfile.lock.

@kaspth
Copy link
Contributor

kaspth commented Mar 26, 2020

Hm. Not liking that we aren't storing the root Gemfile.lock. That's usually a bad practice that Rails doesn't follow. Also unsure about the JRuby related fix that introduced it: f99d36b

Seems like we do want these Gemfiles committed, no?

@olleolleolle
Copy link
Contributor Author

What prompted me

  • Root ignored it
  • When I created a lockfile, it was with a 2.x Bundler, leaving an incompatible BUNDLED_WITH marker which made the Ruby 2.2 CI matrix elements sad

@kaspth
Copy link
Contributor

kaspth commented Mar 26, 2020

  • When I created a lockfile, it was with a 2.x Bundler, leaving an incompatible BUNDLED_WITH marker which made the Ruby 2.2 CI matrix elements sad

Right, but that only happened because we were ignoring the root Gemfile.lock. But either, we go all the way for one option or the other. Then there's a separate PR in committing gem lockfiles again.

@kaspth kaspth merged commit 3c3781d into rails:master Mar 26, 2020
@olleolleolle olleolleolle deleted the git-ignore-lockfiles branch March 26, 2020 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants