Skip to content

.github: add dry-run input to automerge workflow#209

Draft
lumachad wants to merge 7 commits into
amd-stagingfrom
users/lumachad/automerge_2
Draft

.github: add dry-run input to automerge workflow#209
lumachad wants to merge 7 commits into
amd-stagingfrom
users/lumachad/automerge_2

Conversation

@lumachad

Copy link
Copy Markdown
Collaborator

Summary

  • Adds a dry_run boolean input to the workflow_dispatch trigger
  • When checked in the GitHub Actions UI, passes --dry-run to automerge.py (fetches and probes but skips pushes and PR creation)
  • No effect on scheduled or pull_request-triggered runs

Test plan

  • Trigger manually from the Actions UI with dry-run checked, verify no pushes or PRs are created
  • Trigger manually with dry-run unchecked, verify normal behavior

Adds a boolean workflow_dispatch input so the automerge job can be
triggered manually with --dry-run from the GitHub Actions UI.

Co-Authored-By: Claude <[email protected]>
@lumachad lumachad self-assigned this Jul 14, 2026
@lumachad lumachad added the ci:skip Skip all pre-commit / CI jobs while the label is up label Jul 14, 2026
lumachad and others added 6 commits July 14, 2026 17:26
Remove the if: false guard and enable the job condition.

Co-Authored-By: Claude <[email protected]>
Branch creation and PR opening still run under --dry-run, so the
full workflow can be exercised without touching amd-staging.

Co-Authored-By: Claude <[email protected]>
Instead of checking out and merging locally, push the upstream commit
directly as the ff branch ref. This means the PR contains only the
upstream commits, so a merge commit from GitHub's UI produces a single
clean merge entry with no nested merge commit.

Co-Authored-By: Claude <[email protected]>
Previously 7b returned after opening the ff PR, leaving the conflict
commit for the next run. Now it falls through to step 8 so both PRs
are opened in a single run.

Co-Authored-By: Claude <[email protected]>
Use GITHUB_REPOSITORY (a GitHub Actions default) for the repo slug and
require AUTOMERGE_TARGET_BRANCH (a repository variable set in Settings →
Variables → Actions) for the branch being updated.  Both punt with an
error if unset.

Upstream remote URL and branch (sourceware/master) remain constants.
PR titles, PR bodies, and auto-created branch prefixes are all derived
from the variable values.

Co-Authored-By: Claude <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci:skip Skip all pre-commit / CI jobs while the label is up

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant