search

zephyrproject-rtos / infrastructure

Zephyr Project Infrastructure Management
1 stars 1 forks source link

Enable GitHub merge queue feature #38

Open stephanosio opened 2 years ago

stephanosio commented 2 years ago

Enable GitHub merge queue feature in the Zephyr repository once it is released for production use.

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

stephanosio commented 1 year ago

UPDATE 2023-02

The merge queue feature is now available for public beta testing and has been evaluated in the zephyr-testing repository (see https://github.com/zephyrproject-rtos/zephyr-testing/commits/merge_group).

During the evaluation, the following issues have been identified:

  1. Lack of the ability to "batch"-process multiple pull requests
    • For now, a merge_group run is started as soon as a new PR is added to a merge queue.
    • Example 1: only start merge_group run some time after the last pull request was added to the merge queue
    • Example 2: manually add multiple pull requests to a specific merge queue and start batch merge_group run on them
  2. Previous merge_group runs are not cancelled when a pull request is added to the merge queue.
    • When a merge_group run is in progress and a new pull request is added to the merge queue, a new merge_group run is started alongside the existing merge_group run; the previous run is not cancelled.
stephanosio commented 1 year ago

Re: "Previous merge_group runs are not cancelled when a pull request is added to the merge queue."

See https://github.com/orgs/community/discussions/46757?sort=top#discussioncomment-4980818