ok/jj
1
0
Fork 0
forked from mirrors/jj
Commit graph

8 commits

Author SHA1 Message Date
Martin von Zweigbergk
b707a29f41 github: fix name of workflow for Dependabot auto-merge
I apparently forgot to update the name when I copied `build.yml`.
2023-03-30 19:29:18 -07:00
Martin von Zweigbergk
b87c1cb514 github: new attempt at Dependabot auto-merge
This is an updated version of the workflow deleted in f5fc3c35f5,
trying the advice from
https://github.com/cli/cli/issues/6695#issuecomment-1348430969.
2022-12-13 10:39:58 -08:00
Martin von Zweigbergk
f5fc3c35f5 github: disable broken attempt to auto-merge Dependabot PRs again
Sigh, I thought it was fixed now, but it seems it's only `gh pr ready`
that works with `GITHUB_TOKEN`. This rolls back commit ee7e7e1b62.
2022-12-05 14:23:43 -08:00
Martin von Zweigbergk
ee7e7e1b62 github: new attempt at auto-enabling merge of Dependabot PRs
cli/cli#1314 is now marked fixed, so let's see if this works. This
rolls back commit 184280f8f801.
2022-12-01 19:28:39 -08:00
Martin von Zweigbergk
10d24ef267 github: remove broken workflow to enable auto-merge for Dependabot
The workflow that was supposed to enable auto-merge for PRs from
Dependabot is failing like this:


```
Message: Resource not accessible by integration, Locations: [{Line:1 Column:72}]
```

I can't figure out why it's failing (maybe
https://github.com/cli/cli/issues/1314?), so let's just remove it.
2022-09-12 10:23:58 -07:00
Martin von Zweigbergk
c7a782b0a1 github: give dependabot auto-merge action permission to update PR
Hopefully this is the last bit I was missing to get this to work :)
2022-09-09 12:43:56 -07:00
Martin von Zweigbergk
a33417fa35 github: pass --rebase to gh pr merge since it requires it
It seems that there's no way to just enable auto-merge without
specifying a merge strategy (presumably because some projects allow
several GitHub merge strategies), so I guess we'll have to live with
the strategy being duplicated between here and the project settings.
2022-09-06 16:08:24 -07:00
Martin von Zweigbergk
2ff710a131 github: enable auto-merge on Dependabot PRs
To merge a Dependabot PR, I have to enable auto-merge (two clicks,
including one to confim) and then review and approve it. Since our
branch protections require the PR to be approved, it seems that that
should be enough. This patch adds a GitHub action that calls runs the
GitHub CLI to do that. It is based on
https://dev.to/slashgear_/how-to-automatically-merge-dependabot-pull-requests-with-github-actions--30pe
2022-09-02 11:49:26 -07:00