dlang-bot icon indicating copy to clipboard operation
dlang-bot copied to clipboard

Published 20 hours ago • verified publisher icon dlang

Add merge_stable action to dlang-bot

Open wilzbach opened this issue 7 years ago • 3 comments

Whenever a new commit gets pushed to stable, dlang-bot should submit a PR to master (if it can without merge conflicts).

  • clone the repository
  • execute sth. like https://github.com/wilzbach/git-tools/blob/master/merge_stable

If there are merge conflicts, it should add a comment to the merged PR.

wilzbach avatar Jan 08 '18 15:01 wilzbach

Apparently not possible to have empty PRs on GH :/. But we could always create (if not exists) a PR on pushes to stable. Even better with auto-merge already applied (once #69 is fixed).

MartinNowak avatar Jan 15 '18 17:01 MartinNowak

See also: http://forum.dlang.org/post/[email protected]

wilzbach avatar Jan 16 '18 04:01 wilzbach

We could submit a PR even when there are merge conflicts, and comment on that one to ask for merge conflict resolution. Ideally we'd have a bit of a delay, e.g. 1hour after a push to stable, so we don't trigger CI with 10 individual commits. Also I still need to manually merge stable to master to update the website during releases. Automation in that area has been fairly hindering and the dlang.org CI needs manual review atm. anyhow. Maybe better to exempt dlang.org from this automation.

MartinNowak avatar Jan 16 '18 20:01 MartinNowak