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

Enable mergify for this repo #33

Closed
nomeata opened this issue Sep 20, 2021 · 3 comments
Closed

Enable mergify for this repo #33

nomeata opened this issue Sep 20, 2021 · 3 comments
Assignees

Comments

@nomeata
Copy link
Contributor

nomeata commented Sep 20, 2021

Mergify is a great tool that leaves merging to this bot, meaning less maual work for us.

One great feature is that it supports squash merges that take the PR description as the commit message. So instead of a commit message like fb558eb we’d get something nicely curated like the PR description of #30. You can achieve the same manually (as explained here), and that’s how I have been merging PRs in this repo so far, but it is tedious work, so won’t always work.

There is more that we can do with mergify, e.g. auto-merge dependency bumps.

We already have mergify enabled for the sister repository dfinity/motoko, so I see no problem doing it here too. Someone just has to enable it in https://github.com/organizations/dfinity/settings/installations/12369523, and I will prepare a PR with the configuration.

@basvandijk, are you still doing this kind of infra work? Or who should I nudge?

@marcin-dziadus
Copy link
Contributor

@nomeata Mergify should be already enabled!

nomeata added a commit to nomeata/ic-hs that referenced this issue Oct 1, 2021
this adds a mergify configuration to the repo, fixing dfinity#33.

TL;DR: Label a PR with `automerge-squash` and it will be merged once
approved an green. Also, mergify will update out-of-date branches as
`master` changes.

It is based on the `.mergify.yaml` from Motoko, but omitting the “fancy”
features (e.g. approving changelog changes and dependency bumps). We can
add them when and if we add auto dependency bumping, but we don’t have
that many dependencies, so maybe not needed.
@nomeata
Copy link
Contributor Author

nomeata commented Oct 1, 2021

Oh, indeed? Let’s try

marcin-dziadus pushed a commit that referenced this issue Oct 1, 2021
this adds a mergify configuration to the repo, fixing #33.

TL;DR: Label a PR with `automerge-squash` and it will be merged once
approved an green. Also, mergify will update out-of-date branches as
`master` changes.

It is based on the `.mergify.yaml` from Motoko, but omitting the “fancy”
features (e.g. approving changelog changes and dependency bumps). We can
add them when and if we add auto dependency bumping, but we don’t have
that many dependencies, so maybe not needed.
@marcin-dziadus
Copy link
Contributor

I think we can close this issue. Thank you for your contribution!

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

No branches or pull requests

2 participants