Commit Graph

20 Commits (e4ab45d756d3271af1429103a942c534e46fd4b9)

Author SHA1 Message Date
Guillaume Abrioux 7b9a459ce3 mergify: add stable-8.0
This adds the mergify support for stable-8.0

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
2024-03-16 17:24:05 +01:00
Guillaume Abrioux 11c0e93165 mergify: reindent file properly
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2022-06-15 11:28:40 +02:00
Guillaume Abrioux a571a9128e mergify: add backport configuration for stable-7.0
So we can ask mergify to do automatic backport in stable-7.0

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2022-06-15 11:28:40 +02:00
Guillaume Abrioux 8a5fb702f2 mergify: add restriction on backport command
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2022-06-14 10:02:19 +02:00
Guillaume Abrioux 26acaf9eeb mergify: add stable-6.0 backport configuration
This adds the stable-6.0 backport configuration in mergify.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2021-02-10 14:57:01 +01:00
Guillaume Abrioux 5e879dd964 Revert "mergify: add configuration for 4.2z1 branch"
This reverts commit fb7dced598.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2020-12-15 17:28:56 +01:00
Guillaume Abrioux fb7dced598 mergify: add configuration for 4.2z1 branch
So we get backports against 4.2z1 branch (downstream related) automatically
created by mergify

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2020-12-15 10:01:46 +01:00
Dimitri Savineau 2f17f36638 mergify: remove merge on skip ci
This rule will probably never be applyied and at the moment this is
creating a cancelled job in the CI status.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
2020-06-09 09:30:10 -04:00
Dimitri Savineau 784f16c061 mergify: Update with stable-5.0 branch
Add action to backport commits to stable-5.0.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
2020-03-25 21:01:12 +01:00
Dimitri Savineau 4bba1d0fc5 mergify: disable automerge on backport
For now we disable the automerge on backport PR until we find a better
solution.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
2019-10-09 17:17:46 +02:00
Dimitri Savineau 5f806f2a05 mergify: Update condition on status success
We don't have one global pipeline anymore reporting the jenkins job
status. So we need to match the  CI scenario name.
This also add the Travis CI status as a condition.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
2019-10-09 06:55:04 +02:00
Guillaume Abrioux a08f5f2ea2 mergify: disable automatic merging on master
automatic merging by mergify is failing for a while now.
Until we can figure out what's wrong, let's disable it on master for now
so we don't merge "failing" PRs although they passed all scenarios.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2019-08-19 12:32:56 +02:00
Dimitri Savineau 76f80277ed mergify: Update with stable-4.0 branch
Add action to backport commits to stable-4.0.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
2019-03-29 10:26:23 +01:00
Guillaume Abrioux 1c30c76f8c mergify: need 2 approvals to merge a 'skip ci' PR
This will avoid merging PR with 1 approval + [skip ci]

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2019-02-28 13:07:51 +01:00
Julien Danjou 07140f8063 Mergify: fix regexp operator 2018-10-15 15:56:04 +02:00
Julien Danjou 25bde39539 Update Mergify configuration to v2
Signed-off-by: Julien Danjou <julien@danjou.info>
2018-10-15 14:42:05 +02:00
Sébastien Han 96b187b30e ci: remove DCO
We know a Signed-off-by check inside our pipeline so this bot is not
needed anymore.

Signed-off-by: Sébastien Han <seb@redhat.com>
2018-07-02 16:08:18 +02:00
Julien Danjou d0cd6de5a5 Use rebase as merge strategy for PR
Signed-off-by: Julien Danjou <julien@danjou.info>
2018-06-26 13:38:40 +02:00
Julien Danjou 824ec6d256 Use rebase as merge strategy for PR
Signed-off-by: Julien Danjou <julien@danjou.info>
2018-06-26 11:10:45 +02:00
Sébastien Han ddb1520c33 add mergify
Mergify automatically merges pull requests when they're ready so you
don't have to. You set the rules, it does the rest.

Signed-off-by: Sébastien Han <seb@redhat.com>
2018-06-25 16:43:54 +02:00