Commit Graph

18 Commits

Author SHA1 Message Date
teor 6711616e41
change(ci): Combine high and low Mergify queues into a batched queue (#5201)
* Combine high and medium queues into a batched queue

* Explain how to check config syntax

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2022-09-28 06:34:53 +10:00
teor 4282af4690
ci(mergify): increase batch sizes (#4947)
* Increase Mergify batch sizes

* Use the maximum mergify batch size, except for critical priority PRs
2022-08-24 18:23:44 -04:00
Gustavo Valverde 8d6957f39b
ci(mergify): do not create draft PRs if not needed (#4540)
* fix(ci): do not create draft PRs if not needed
2022-06-01 14:40:56 -04:00
teor 2041d69312
ci(Mergify): Fix invalid mergify config on main branch (#4120)
Signed-off-by: teor <teor@riseup.net>
2022-04-14 17:15:57 +10:00
Gustavo Valverde 970f06d332
refactor(queue)!: improve mergify merge throughput (#4094)
* refactor(ci)!: rename queues and reassign labels

* imp(ci:) allow a bigger throughput for merge trains

* imp(ci): allow mergify to interrupt queues that are not a hotfix

* imp(ci): add a bigger timeout before creating speculative checks

* Update .github/mergify.yml

Co-authored-by: teor <teor@riseup.net>

* Update .github/mergify.yml

Co-authored-by: teor <teor@riseup.net>

* Apply suggestions from code review

Co-authored-by: teor <teor@riseup.net>

Co-authored-by: teor <teor@riseup.net>
2022-04-14 10:17:16 +10:00
teor 9055f0f3a1
ci(Mergify): configuration update (#4105)
Signed-off-by: teor <teor@riseup.net>
2022-04-13 10:28:03 +10:00
Gustavo Valverde 90c6980630
imp(ci): use GitHub Branch Protection checks instead of Mergify (#4103) 2022-04-13 09:43:58 +10:00
Gustavo Valverde 831a2009bd
style(ci): lint and standardize the actions structure (#3940)
* style(ci): comply with https://json.schemastore.org/github-workflow.json

Some substituions were harder to make as files were not standardized

* fix(mergify): use correct name for macos

* style(actions): revert to single quotes

* style: lint dependabot and mergify conf files

* style: remove conditions with missing context

* imp(lint): automate GH Actions linting

* fix(lint): some actions need to be triggered by PR event

* fix(lint): consider all workflow YAMLs

* Use the same paths in the patch file

* revert: keep condition as is

* add TODO

* fix: add missing checkpoint_sync input

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2022-04-12 15:06:37 +10:00
teor 413f7fbb1d
fix(ci): remove coverage from mergify because nightly fails (#3886) 2022-03-16 00:07:04 -04:00
Conrado Gouvea bbef390944
change(ci): remove Windows support (#3819)
* ci: remove Windows support

* address comments
2022-03-10 10:50:12 +10:00
Gustavo Valverde 6fafd1af57
refactor(mergify): better test requirements and merge conditions (#3580)
* fix(mergify, actions): use better names and require tests

* feat(queue): do not update the actual PR, create a draft

Do not allow to update/rebase the original pull request to check its mergeability. Create a draft pull request instead.

This doesn't add Mergify as a co-author

* feat(queue): do not interrupt already running queues

Our queues might take more than 5 hours even if the priority is low.

Do not allow interrupting the ongoing speculative checks when a pull request with higher priority enters in the queue.

* fix(mergify): move 'allow' attributes to queue_rules

* fix(mergify): attributes are not conditions
2022-02-18 17:53:27 -05:00
Gustavo Valverde d2e58dfa37 fix(mergify): do not wait for depecrated Cloud Build
Cloud Build was recently removed, and Mergify is expecting a result from a non-existing action.
2022-02-10 18:44:10 -05:00
teor 6ddbe7972d
fix(mergify): put PRs with no priority label in the low priority queue (#3454)
This also lets us handle dependabot PRs using the low queue rule.
2022-02-02 02:07:33 +00:00
Gustavo Valverde 4d32f9c765
fix(mergify): restrict merges if there are unresolved reviews (#3453) 2022-02-02 00:28:59 +00:00
teor aef75ee9ff
fix(mergify): use low-priority queue for the correct jobs (#3406)
This fixes an inverted match condition.
2022-01-26 07:45:14 -04:00
Gustavo Valverde ee9f081dd5
Do not update PRs to the latest tip automatically (#3351)
This causes the Mergify bot to commit to each PR, being also included in the squashed merge as an author.

As the queue merges the head branch (main) to latest tip before testing with the CI, having all those feature branches constantly updating with Mergify is not needed
2022-01-14 11:26:55 -05:00
Gustavo Valverde dc4533d368
Use the correct conditions and merge method in Mergify (#3341)
* fix: Use the correct conditions and merge method

Mergifys Status Checks conditions are based on the job name, not the worflow name. As our worflows have dynamic names, each variant must be considered.

Squash merges are the default being used in the Zebra repo, so mergify must comply with this configuration.

Use condition operators for labels in each pull request rule; previously it was expecting both labels to be set. And update names accordingly.

* fix: Allow mergify to merge dependabot PRs

Also adapt dependabot's configuration to use the recently adapted labels

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2022-01-13 23:34:09 +00:00
Gustavo Valverde fc1a1cdac1
Add mergify merging queues (#3324)
* Add mergify merging queues

* Fix Mergify invalid configuration

* Improve adaptability to the actual workflow

Do not merge if the pull-request test is not green. Do not move draft PRs to the queue. And update keep all open PRs updated.

* Fix a typo on check-success condition
2022-01-07 19:11:01 -05:00