Skip to content

feat: configure automatic PR merge behavior - #668

Merged
neilime merged 1 commit into
mainfrom
fix/controlled-automatic-merges-20261117
Nov 17, 2026
Merged

neilime merged 1 commit into
mainfrom
fix/controlled-automatic-merges-20261117

Conversation

@neilime

@neilime neilime commented Nov 17, 2026 •

Copy link
Copy Markdown
Member

Generated updates need to limit the committed paths and choose whether to request administrator merge privileges. Add two optional inputs while preserving the current behavior for existing callers: bypass-branch-protection defaults to true, and an empty add-paths includes all changes. Existing input definitions, defaults, outputs and merge strategies remain unchanged.

Callers can explicitly set bypass-branch-protection: "false" to use a normal merge. In that mode, a protection failure never escalates to administrator privileges. Always guard the created PR head with --match-head-commit, and fail if it changes before or during the merge.

Move the existing merge script into the action's own source module for tests without GitHub mutations or new dependencies. Retain bounded retries and merge-output verification, add the standalone Node.js test workflow to the combined CI reports, and regenerate the README with CI Dokumentor.

Validation: 17 tests pass, covering the existing default, explicit enable/disable choices, protection failures, concurrent head changes, retry limits and verified merge outputs. The compatibility test failed against the previous proposed default and passes now. Existing public input definitions/defaults and outputs were compared with the base branch. JUnit/LCOV reporting, Biome, actionlint, zizmor, YAML and Markdown checks pass.

Consumer migration: neilime/php-css-lint#237 will use generation, composer ci, then the shared action with add-paths and bypass-branch-protection: "false" after a stable release containing these additions. Existing consumers need no bypass-setting migration.

@github-actions github-actions Bot added type: breaking Introduces a breaking change type: fix Fixes a bug labels Nov 17, 2026
@github-actions

github-actions Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

Internal - Pull request - Continuous Integration - Test results

Workflow run and full reports · Commit 5b0d598

Jobs: 7 success · 0 failure · 0 cancelled · 0 skipped · 0 abandoned.

Test: 315 passed · 0 failed · 0 skipped.

Test details

Test results

Test Results

Status Count
✅ Passed 315
❌ Failed 0
⏭️ Skipped 0
Total 315
Suite Passed Failed Skipped
AstroCheckParser 5 0 0
CheckStyleParser 4 0 0
Cobertura auto-detection 2 0 0
CoberturaParser 3 0 0
Compact category comments 2 0 0
Consolidated reports 2 0 0
Coverage 2 0 0
ESLintParser 3 0 0
JUnitParser 5 0 0
LCOVParser 3 0 0
LintIssue 2 0 0
LoggerService 1 0 0
MarkdownFormatter 2 0 0
Nested JUnit suites 2 0 0
ParserFactory 5 0 0
PathRewriter 14 0 0
PrettierParser 4 0 0
Report exclusions 1 0 0
ReportData 4 0 0
ReportParserCore 2 0 0
ReportParserCore.parseOutputFormats 2 0 0
ReportPathResolver 6 0 0
run 10 0 0
SarifParser 4 0 0
SummaryFormatter 2 0 0
TAPParser 6 0 0
TestResult 4 0 0
Unknown Suite 213 0 0

✅ Pass Rate: 100.0%

Job results and report availability
Job Result Report artifacts
lint success 2
test-action-distributions success 1
test-action-test-action-distribution success 1
test-action-lint-pull-request-title success 1
test-action-create-and-merge-pull-request success 1
test-action-parse-ci-reports success 1
test-action-need-fix-to-issue success 1

Only this attempt is included. On partial reruns, rerun all producer jobs for complete reports. CodeQL findings remain in code scanning; other diagnostics remain in the job logs.

@github-actions

github-actions Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

Internal - Pull request - Continuous Integration - Code coverage

Workflow run and full reports · Commit 5b0d598

Jobs: 7 success · 0 failure · 0 cancelled · 0 skipped · 0 abandoned.

Coverage: 6 source report(s); percentages remain separate.

Coverage details

Coverage results

ci-reports-1-test-action-create-and-merge-pull-request-actions-create-and-merge-pull-request-e537876f-a65c-42ad-b93d-632867aa37f4/lcov.info

Coverage

Metric Covered Total Percentage
Lines 205 205 100.00%
Branches 60 62 96.77%
Functions 26 30 86.67%

Overall: 100.00% 🟢
🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩

ci-reports-1-test-action-distributions-actions-action-distributions-30c013f0-fab9-47ff-b9c5-498889f4437a/lcov.info

Coverage

Metric Covered Total Percentage
Lines 898 917 97.93%
Branches 253 262 96.56%
Functions 79 80 98.75%

Overall: 97.93% 🟢
🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩

ci-reports-1-test-action-lint-pull-request-title-actions-quality-lint-pull-request-title-a31cf507-da39-45de-9587-385392d67592/lcov.info

Coverage

Metric Covered Total Percentage
Lines 45 45 100.00%
Branches 14 15 93.33%
Functions 1 1 100.00%

Overall: 100.00% 🟢
🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩

ci-reports-1-test-action-need-fix-to-issue-actions-need-fix-to-issue-d12f8fe0-d2b0-422f-a0cb-c31da455336c/lcov.info

Coverage

Metric Covered Total Percentage
Lines 95 95 100.00%
Branches 36 36 100.00%
Functions 7 7 100.00%

Overall: 100.00% 🟢
🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩

ci-reports-1-test-action-parse-ci-reports-actions-quality-parse-ci-reports-9cd88135-e9e5-409f-9492-ef724d2010d7/lcov.info

Coverage

Metric Covered Total Percentage
Lines 2563 2687 95.39%
Branches 478 578 82.70%
Functions 194 200 97.00%

Overall: 95.39% 🟢
🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩⬜

ci-reports-1-test-action-test-action-distribution-actions-quality-test-action-distribution-b94f62d9-7673-493d-9195-362bc6850d2d/lcov.info

Coverage

Metric Covered Total Percentage
Lines 71 71 100.00%
Branches 13 13 100.00%
Functions 4 4 100.00%

Overall: 100.00% 🟢
🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩

Job results and report availability
Job Result Report artifacts
lint success 2
test-action-distributions success 1
test-action-test-action-distribution success 1
test-action-lint-pull-request-title success 1
test-action-create-and-merge-pull-request success 1
test-action-parse-ci-reports success 1
test-action-need-fix-to-issue success 1

Only this attempt is included. On partial reruns, rerun all producer jobs for complete reports. CodeQL findings remain in code scanning; other diagnostics remain in the job logs.

@github-actions

github-actions Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

Internal - Pull request - Continuous Integration - Lint results

Workflow run and full reports · Commit 5b0d598

Jobs: 7 success · 0 failure · 0 cancelled · 0 skipped · 0 abandoned.

Lint: Collected diagnostics and Super-Linter summaries. Execution status is included in the job outcomes.

Super-Linter details

Super-linter summary

Language Validation result
BIOME_FORMAT Pass ✅
BIOME_LINT Pass ✅
CHECKOV Pass ✅
GITHUB_ACTIONS Pass ✅
GITHUB_ACTIONS_ZIZMOR Pass ✅
GITLEAKS Pass ✅
GIT_COMMITLINT Pass ✅
GIT_MERGE_CONFLICT_MARKERS Pass ✅
JSCPD Pass ✅
MARKDOWN Pass ✅
MARKDOWN_PRETTIER Pass ✅
NATURAL_LANGUAGE Pass ✅
PRE_COMMIT Pass ✅
SPELL_CODESPELL Pass ✅
TRIVY Pass ✅
YAML Pass ✅
YAML_PRETTIER Pass ✅

All files and directories linted successfully

For more information, see the GitHub Actions workflow run

Powered by Super-linter
Super-linter revision: 2da136927bd4a73596db63044b504547c62cb854
Super-linter version: 9.0.0

Super-Linter details
Linter Status
Fixture linter ✅
Job results and report availability
Job Result Report artifacts
lint success 2
test-action-distributions success 1
test-action-test-action-distribution success 1
test-action-lint-pull-request-title success 1
test-action-create-and-merge-pull-request success 1
test-action-parse-ci-reports success 1
test-action-need-fix-to-issue success 1

Only this attempt is included. On partial reruns, rerun all producer jobs for complete reports. CodeQL findings remain in code scanning; other diagnostics remain in the job logs.

@neilime neilime changed the title fix!: require explicit bypass for automatic PR merges feat: configure automatic PR merge behavior Nov 17, 2026
@neilime neilime removed type: breaking Introduces a breaking change type: fix Fixes a bug labels Nov 17, 2026
@neilime
neilime force-pushed the fix/controlled-automatic-merges-20261117 branch from 056e536 to fb4f2c0 Compare November 17, 2026 09:23
@github-actions github-actions Bot added the type: feature Introduces a new feature label Nov 17, 2026
@neilime
neilime merged commit e22450b into main Nov 17, 2026
131 checks passed
@neilime
neilime deleted the fix/controlled-automatic-merges-20261117 branch November 17, 2026 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: feature Introduces a new feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant