Skip to content

Add auto-merge GitHub Actions workflow#14

Open
badMade wants to merge 3 commits into
mainfrom
jules-4791806961422141458-58dcb5f9
Open

Add auto-merge GitHub Actions workflow#14
badMade wants to merge 3 commits into
mainfrom
jules-4791806961422141458-58dcb5f9

Conversation

@badMade
Copy link
Copy Markdown
Owner

@badMade badMade commented Apr 15, 2026

Creates a GitHub Actions workflow to auto-merge PRs.

The workflow satisfies all user criteria:

  • Triggers on pull_request (opened, synchronize, reopened, labeled).
  • Skips fork PRs using if: github.event.pull_request.head.repo.full_name == github.repository.
  • Includes correct permissions.
  • Implements delays: 5 minutes for CI start, 5 minutes for CI completion, 1 minute before final check, 1 minute before squash merge.
  • Verifies PR is still open, relevant CI checks (excluding itself) passed, and there is a reviewed label and reviews detected.
  • Post appropriate comments for missing CI checks, missing reviews, pending review labels, and merge failures.

PR created automatically by Jules for task 4791806961422141458 started by @badMade

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
@google-labs-jules
Copy link
Copy Markdown

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

@gemini-code-assist
Copy link
Copy Markdown

Note

Gemini is unable to generate a review for this pull request due to the file types involved not being currently supported.

@github-actions
Copy link
Copy Markdown

Auto-merge skipped: Missing checks (no CI detected).

@badMade
Copy link
Copy Markdown
Owner Author

badMade commented Apr 22, 2026

@copilot code review

@badMade
Copy link
Copy Markdown
Owner Author

badMade commented Apr 22, 2026

@claude code review

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Adds a GitHub Actions workflow intended to automatically squash-merge eligible pull requests after CI and review gates are satisfied.

Changes:

  • Introduces an Auto Merge workflow triggered by pull_request events (opened/synchronize/reopened/labeled).
  • Implements delayed execution, CI check evaluation, review/label gating, and merge attempt with failure commenting.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .github/workflows/auto-merge.yml
Comment thread .github/workflows/auto-merge.yml
Comment thread .github/workflows/auto-merge.yml
Comment thread .github/workflows/auto-merge.yml
Comment thread .github/workflows/auto-merge.yml
@badMade
Copy link
Copy Markdown
Owner Author

badMade commented Apr 23, 2026

@codex Code Review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 67c59b4f10

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread .github/workflows/auto-merge.yml
Comment thread .github/workflows/auto-merge.yml
@badMade badMade marked this pull request as ready for review April 23, 2026 14:49
@badMade
Copy link
Copy Markdown
Owner Author

badMade commented Apr 23, 2026

@codex code review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 67c59b4f10

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +122 to +125
await github.rest.pulls.merge({
owner, repo, pull_number,
merge_method: 'squash'
});
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Pin merge to verified head SHA

This merge call is not guarded with a head SHA, even though checks were evaluated earlier against ref from the original event payload. If a new commit is pushed during the built-in waits (e.g., after an opened/synchronize trigger), this run can still merge the PR’s newer head without validating that commit’s CI/review state. The GitHub merge API supports a sha precondition specifically to prevent this race, so omitting it can auto-merge unverified changes.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

@copilot, make changes based on the above suggestion.

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

@copilot, make changes based on the above suggestion.

@badMade
Copy link
Copy Markdown
Owner Author

badMade commented Apr 30, 2026

@gemini-code-assist, what are the steps and line numbers to make this fix?

@gemini-code-assist
Copy link
Copy Markdown

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

@badMade
Copy link
Copy Markdown
Owner Author

badMade commented May 6, 2026

@copilot, resolve the merge conflicts in this pull request.

Co-authored-by: badMade <106821302+badMade@users.noreply.github.com>
Copy link
Copy Markdown

Copilot AI commented May 6, 2026

@copilot, resolve the merge conflicts in this pull request.

Resolved by merging origin/main into this branch and fixing the conflict in .github/workflows/auto-merge.yml (kept this PR’s workflow content). Included in commit 38be2f8.

@badMade
Copy link
Copy Markdown
Owner Author

badMade commented May 25, 2026

@copilot, resolve the merge conflicts in this pull request.

Copilot AI review requested due to automatic review settings May 25, 2026 23:14
@badMade badMade review requested due to automatic review settings May 25, 2026 23:14
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.

3 participants