Skip to content

add admin override option to ansible-pcp sync workflow#250

Merged
richm merged 1 commit intolinux-system-roles:mainfrom
sfeifer:pcp-sync-workflow-fix
Aug 14, 2025
Merged

add admin override option to ansible-pcp sync workflow#250
richm merged 1 commit intolinux-system-roles:mainfrom
sfeifer:pcp-sync-workflow-fix

Conversation

@sfeifer
Copy link
Copy Markdown
Collaborator

@sfeifer sfeifer commented Aug 14, 2025

As observed in #249, a PR needs at least 1 approval to allow merging. To work around this in the sync ansible-pcp git subtree action, the --admin option is now used when merging the PR. This allows bypassing the approval.

This may also require a change to the branch protection rules. It looks like the "Allow specified actors to bypass required pull requests" option needs to be enabled for the --admin option to work.

Summary by Sourcery

Enable admin override when merging sync ansible-pcp subtree PRs

Enhancements:

  • Add --admin flag to gh pr merge command in the subtree workflow
  • Update merge confirmation message to reflect admin override and branch deletion

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai bot commented Aug 14, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Updates the ansible-pcp subtree sync workflow to invoke gh pr merge with the --admin flag, enabling bypass of required approvals.

Sequence diagram for admin override in PR merge workflow

sequenceDiagram
    participant Workflow as GitHub Actions Workflow
    participant gh as GitHub CLI
    participant GitHub as GitHub API
    Workflow->>gh: gh pr merge "$PR_URL" --squash --delete-branch --admin
    gh->>GitHub: Merge PR with admin override
    GitHub-->>gh: PR merged, branch deleted
    gh-->>Workflow: Success message
Loading

File-Level Changes

Change Details Files
Added admin override flag to the PR merge step
  • Appended --admin to the gh pr merge command
  • Updated the echo statement to mention admin override
.github/workflows/subtree.yml

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Copy Markdown

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey there - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@richm richm merged commit 28a9b73 into linux-system-roles:main Aug 14, 2025
12 of 20 checks passed
@sfeifer sfeifer deleted the pcp-sync-workflow-fix branch August 18, 2025 21:01
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.

2 participants