Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add merge_stable action to dlang-bot #165

Open
wilzbach opened this issue Jan 8, 2018 · 3 comments
Open

Add merge_stable action to dlang-bot #165

wilzbach opened this issue Jan 8, 2018 · 3 comments

Comments

@wilzbach
Copy link
Member

wilzbach commented Jan 8, 2018

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

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

@MartinNowak
Copy link
Member

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).

@wilzbach
Copy link
Member Author

@MartinNowak MartinNowak added 3-mi and removed 2-re labels Jan 16, 2018
@MartinNowak
Copy link
Member

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants