chore: Enable renovate automerge for non-major updates

[MartinWitt]

After discussion with @monperrus this renovate config enables automerge of green PR updates from renovate. I have changed the master protection rules to let renovate bypass them. I removed some old mockito rule which seems useless.

[algomaster99]

fix is not an allowed value based on the documentation over here.

[MartinWitt]

fixed it

[slarse]

Just for clarity, could we include in the commit message on master that this does not apply to major version updates? Something like "Enable renovate automerge for non-major updates".

[MartinWitt]

Just for clarity, could we include in the commit message on master that this does not apply to major version updates? Something like "Enable renovate automerge for non-major updates".

Yes I can do this, but this is also an open point for discussion. Shall we automerge major version changes?

[slarse]

Just for clarity, could we include in the commit message on master that this does not apply to major version updates? Something like "Enable renovate automerge for non-major updates".

Yes I can do this, but this is also an open point for discussion. Shall we automerge major version changes?

I would spontaneously say no. Even if our tests pass, there may be problems for consumers when major library versions change. I think a major version upgrade always warrants at least a cursory inspection of the consequences of adopting it.

[algomaster99]

warrants at least a cursory inspection of the consequences of adopting it

It is hard to narrow down which part of the code would be affected by the dependency update, especially on such a big codebase. So I am not sure where I would look for possible failures.

For example, Spoon relies heavily on eclipse JDT so if there is an incompatible change, our tests would most likely detect it. But for other less used dependencies, our tests may not detect it, but I imagine it would be rare.

[MartinWitt]

Okay, let's start without major versions and see how it goes? We can change this any moment if we believe merging majors is useful too.

[slarse]

Let's go? Any objections @SirYwell @I-Al-Istannen @algomaster99 ?

[monperrus]

Really nice, thanks a lot @MartinWitt and all for your inputs

[MartinWitt]

Currently, renovate is not doing any auto-merge. I believe a config change only affects new pull requests. In the pull requests, the lights for the auto-merge are green, so our config is correct. Lets merge them and see if it works for new pull-requests?

[slarse]

@MartinWitt It feels like something is wrong, because if you have a look at the recent PRs they say "Automerge: Enabled". Maybe some permission is missing for the bot s.t. it cannot automerge? Perhaps the branch protection bypass isn't working as intended?

[slarse]

Don't we have "Pull request required" enabled? I'm not boss enough to check the branch protection rules but seems like that would be a show-stopper (for some reason??).

https://docs.renovatebot.com/key-concepts/automerge/#pull-requests-required