monterail / guidelines

[DEPRECATED] We are Ruby on Rails experts from Poland. Think hussars. Solid & winged. These are our guidelines.
71 stars 17 forks source link

Periodically run bundle update/bundle outdated #186

Closed teamon closed 10 years ago

teamon commented 10 years ago

We should try to keep gems up to date as much as possible. I can see few possible ways to do that:

Any ideas?

@jandudulski, @sheerun, @chytreg, @szajbus, @Ostrzy, @jcieslar, @tallica

*By "do not care" I mean "Do what you need to do"

jandudulski commented 10 years ago

Update gems in feature branch while working on it - possible lots of merge conflicts

They would happen only in Gemfile.lock - it's not a problem at all. And I'm on this option.

szajbus commented 10 years ago
  • Update gems in feature branch while working on it - possible lots of merge conflicts

Possibility that multiple devs will be doing that at the same time. Unclear branch history.

  • Update gems on master before release - please never do that

    Yeah, don't

    • Update gems on staging after merging feature branches - since staging branch is very temporary this will be pointless/have to be repeated a lot of times

    Nope

    • Treat gems update as a regular feature (new branch, merged in staging etc) - there won't be task for that in trello, there won't be release date set up etc, this is very internal and most clients do not care* about that.

Yes

sheerun commented 10 years ago

I think new gems should be added in feature branches, gem updates are "fixes", and should be applied to master (optionally as features, merged to master).

That's because we "almost" have another rule, that feature branch is ready to merge if it introduces no merge conflicts (rebase it first).

teamon commented 10 years ago

PING @chytreg, @Ostrzy, @jcieslar, @tallica

sheerun commented 10 years ago

@teamon Make decision and close

tallica commented 10 years ago

:+1:

teamon commented 10 years ago

If you update one gem there is specific reason for it - you need some new feature or bugfix and that will usually happen in feature/fix branch. If you update all gems then it should be on master.

teamon commented 10 years ago

@monterail/dev any last comments?