Skip to content

Simplify: use github.token for all branch updates#14

Merged
maansaake merged 7 commits into
mainfrom
fix/auto-update-pr-unknown-state
May 31, 2026
Merged

Simplify: use github.token for all branch updates#14
maansaake merged 7 commits into
mainfrom
fix/auto-update-pr-unknown-state

Conversation

@maansaake
Copy link
Copy Markdown
Member

@maansaake maansaake commented May 31, 2026

Remove the Jeeves app token step entirely. Since github-actions[bot] now handles all branch updates (Dependabot and non-Dependabot alike), the app token was serving no purpose.

The simplified workflow:

  • No actions/create-github-app-token step
  • No author-based branching
  • All open PRs updated with a single gh pr update-branch --rebase loop using github.token

GitHub Copilot and others added 2 commits May 31, 2026 21:53
Trigger a Dependabot rebase when mergeStateStatus is UNKNOWN in
addition to BEHIND, matching the behaviour in github-actions-help.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Dependabot only accepts commands from accounts with push access.
The Jeeves app token is not recognised as such in all repos, causing
"Sorry, only users with push access can use that command".

Use the vanilla github.token (github-actions[bot]) for the comment
so Dependabot accepts it, while keeping the Jeeves token for
gh pr update-branch on non-Dependabot PRs.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@maansaake maansaake changed the title Handle UNKNOWN merge state for Dependabot PRs Handle UNKNOWN merge state and fix Dependabot comment token May 31, 2026
Dependabot checks the author_association of comments and only accepts
commands from OWNER, MEMBER, or COLLABORATOR. Both github-actions[bot]
and GitHub App bots get author_association NONE, so their comments are
rejected.

Use a PAT from a user with write access (stored as DEPENDABOT_REBASE_TOKEN)
so comments are posted as that user and Dependabot accepts them.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@maansaake maansaake changed the title Handle UNKNOWN merge state and fix Dependabot comment token Use DEPENDABOT_REBASE_TOKEN (PAT) for Dependabot rebase comments May 31, 2026
GitHub Copilot and others added 3 commits May 31, 2026 22:13
Posting @dependabot rebase comments requires OWNER/MEMBER/COLLABORATOR
author_association, which GitHub App bots cannot have (GitHub rejects
adding bot accounts as collaborators).

Instead, use github.token (github-actions[bot]) to call update-branch
for Dependabot PRs. This separates the pusher (github-actions[bot]) from
the approver (mr-jeeves[bot]), so GitHub does not block Jeeves from
approving the resulting synchronize event.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The Jeeves app token was only needed to comment @dependabot rebase on
Dependabot PRs, but GitHub App bots cannot be repository collaborators
so Dependabot always rejected those comments.

The solution was to use github.token (github-actions[bot]) for the
update-branch call instead. Since all PRs now use the same token and
the same mechanism, there is no need to distinguish by author or to
generate a Jeeves app token at all.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@maansaake maansaake changed the title Use DEPENDABOT_REBASE_TOKEN (PAT) for Dependabot rebase comments Simplify: use github.token for all branch updates May 31, 2026
Use Jeeves app token (actions/create-github-app-token) instead of
github.token so that the rebase push triggers downstream workflows.
Branch updates are performed with gh pr update-branch --rebase via CLI,
not by commenting on the PR.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@maansaake maansaake merged commit 777d8dc into main May 31, 2026
12 checks passed
@maansaake maansaake deleted the fix/auto-update-pr-unknown-state branch May 31, 2026 20:27
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

Successfully merging this pull request may close these issues.

1 participant