Skip to content

ci: prepare for merge queue - #2231

Merged
Vincent Biret (baywet) merged 3 commits into
mainfrom
ci/prepare-merge-queue
Nov 6, 2026
Merged

Vincent Biret (baywet) merged 3 commits into
mainfrom
ci/prepare-merge-queue

Conversation

@baywet

Copy link
Copy Markdown
Member

Replicates microsoft/kiota#8478 and microsoft/kiota#8497.
We're going to enable the merge queue.

Copilot AI balanced review requested due to automatic review settings November 2, 2026 13:06
@baywet
Vincent Biret (baywet) requested a review from a team as a code owner November 2, 2026 13:06

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

Live verification is needed to confirm that native rulesets preserve the removed protections, required checks run on merge groups, and the token-provider App has repository access, write permissions, and a Dependabot-scoped key.

No open issues 🎉

What changed in this PR

Prepares the repository for enabling a merge queue by updating Dependabot auto-merge authentication and removing the existing branch-protection policy file.

Changes:

  • Uses a scoped GitHub App token for non-major Dependabot auto-merges, reduces default token permissions to read-only, and limits execution to same-repository PRs.
  • Removes the declarative branch-protection policy for main.
File Description
.github/​workflows/​auto-merge-dependabot.yml Updates token permissions, adds a same-repository guard, and authenticates auto-merge with a GitHub App token.
.github/​policies/​kiota-java-branch-protection.yml Deletes the existing branch-protection policy configuration.

Review effort: Balanced

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

The workflow reads CLIENT_ID instead of the configured RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID, causing token generation to fail and blocking auto-merge for eligible Dependabot PRs.

1 open issue

Review effort: Balanced

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 836a4e61-7888-4d0b-9767-3e0a2f56092a
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 1f9abe85-3d79-4ea6-b5a8-385287ff01e7
Copilot AI balanced review requested due to automatic review settings November 6, 2026 18:18
@baywet
Vincent Biret (baywet) enabled auto-merge (squash) November 6, 2026 18:18

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

The workflow references an unconfigured client-ID variable instead of the existing RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID, causing token generation to fail and blocking auto-merge for eligible Dependabot PRs.

1 open issue

Review effort: Balanced

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 1f9abe85-3d79-4ea6-b5a8-385287ff01e7
Copilot AI balanced review requested due to automatic review settings November 6, 2026 18:28
@sonarqubecloud

sonarqubecloud Bot commented Nov 6, 2026

Copy link
Copy Markdown

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

Human assessment is needed because merge-queue commits may lack required checks, depending on retained branch-protection requirements and workflow event coverage.

No open issues 🎉

1 resolved since last review

Review effort: Balanced

@baywet
Vincent Biret (baywet) merged commit c850a29 into main Nov 6, 2026
13 checks passed
@baywet
Vincent Biret (baywet) deleted the ci/prepare-merge-queue branch November 6, 2026 19:07
@github-project-automation github-project-automation Bot moved this from In Progress 🚧 to Done ✔️ in Kiota Nov 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done ✔️

Development

Successfully merging this pull request may close these issues.

3 participants