hrvey / combine-prs-workflow

Combine/group together PRs (for example from Dependabot and similar services)
https://www.hrvey.com/blog/combine-dependabot-prs
MIT License
296 stars 51 forks source link

Keep getting merge conflicts #22

Closed redkhalil closed 1 year ago

redkhalil commented 1 year ago

When combining the dependabot PRs, keep getting merge conflicts, and the workflow is only able to pick one PR... I've observed this on many projects. However when updating library dependencies, the workflow works fine. So I'm getting this issue only on dependabot PRs.

image

I've added some logging, log for another run below

Run actions/github-script@v6
Pull for branch: update/sbt-wartremover-3.0.14
Pull for branch: update/scalafmt-core-3.7.3
Pull for branch: dependabot/github_actions/actions/setup-java-3.11.0
Branch matched prefix: dependabot/github_actions/actions/setup-java-3.11.0
Checking green status: dependabot/github_actions/actions/setup-java-3.11.0
Validating status: SUCCESS
Checking labels: dependabot/github_actions/actions/setup-java-3.11.0
Checking label: dependencies
Adding branch to array: dependabot/github_actions/actions/setup-java-3.11.0
Pull for branch: dependabot/github_actions/actions/checkout-3.5.0
Branch matched prefix: dependabot/github_actions/actions/checkout-3.5.0
Checking green status: dependabot/github_actions/actions/checkout-3.5.0
Validating status: SUCCESS
Checking labels: dependabot/github_actions/actions/checkout-3.5.0
Checking label: dependencies
Adding branch to array: dependabot/github_actions/actions/checkout-3.5.0
Pull for branch: update/sbt-wartremover-3.0.13
Pull for branch: update/mockito-scala-1.17.14
Pull for branch: update/logback-classic-1.4.6
Merged branch dependabot/github_actions/actions/setup-java-3.11.0
Failed to merge branch dependabot/github_actions/actions/checkout-3.5.0
ERROR: HttpError: refusing to allow a GitHub App to create or update workflow `.github/workflows/pull-request.yml` without `workflows` permission
Creating combined PR
redkhalil commented 1 year ago

Workflow requires a classic token with permissions: repo, workflow. Might help to indicate that.