Skip to content

fix(release): expose documentation pull request merge method - #492

Merged
neilime merged 1 commit into
mainfrom
fix/docs-merge-method
Oct 29, 2026
Merged

neilime merged 1 commit into
mainfrom
fix/docs-merge-method

Conversation

@neilime

@neilime neilime commented Oct 29, 2026

Copy link
Copy Markdown
Member

Documentation PRs fail to merge when the default branch requires signed commits: the shared action defaults to rebase, which GitHub cannot sign automatically.

Expose an optional merge-method input and forward it to create-and-merge-pull-request. Existing callers keep the rebase default; repositories with signed-commit requirements can select squash after enabling it in their settings. Regenerate the workflow usage and inputs with CI Dokumentor.

Validation:

  • actionlint .github/workflows/release-actions.yml passed.
  • git diff --check passed.
  • CI Dokumentor regeneration succeeded.
  • Filtered make lint failed only on an existing Trivy finding: CVE-2026-93753 in actions/deploy/jampack/package-lock.json (deepmerge 4.3.1).

Fixes the cause of https://github.com/hoverkraft-tech/ci-github-nodejs/actions/runs/40904389544/job/123560198849. Branch review requirements still apply.

@github-actions github-actions Bot added the type: fix Fixes a bug label Oct 29, 2026
@github-actions

github-actions Bot commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

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

@neilime
neilime marked this pull request as ready for review October 29, 2026 16:08
Signed-off-by: Emilien Escalle <emilien.escalle@escemi.com>
@neilime
neilime force-pushed the fix/docs-merge-method branch from 2e3a64e to 5fd204b Compare October 29, 2026 16:25
@neilime
neilime merged commit ea6682d into main Oct 29, 2026
71 checks passed
@neilime
neilime deleted the fix/docs-merge-method branch October 29, 2026 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: fix Fixes a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant