Skip to content

fix(ci): use the allowed merge method for generated docs - #338

Merged
neilime merged 1 commit into
mainfrom
fix/docs-merge-method-20261117
Nov 17, 2026
Merged

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

Conversation

@neilime

@neilime neilime commented Nov 17, 2026

Copy link
Copy Markdown
Member

The main workflow fails after successful CI because documentation publication requests a squash merge while this repository only allows rebase merges. See run 44071185531.

Remove the explicit merge-method: squash input so create-and-merge-pull-request uses its existing rebase default. This matches the repository's merge settings and keeps the generated documentation commit message, including [skip ci].

Validation: Actionlint, offline Zizmor, YAML lint, YAML formatting and git diff --check passed. The pinned shared action defaults to rebase, the repository allows it, and GitHub reports documentation PR #336 as rebasable. No new tests are needed for this configuration-only change; the original run passed unit tests, distribution validation and all action integration jobs. Followed the repository's CONTRIBUTING.md and organization guidance.

The publication step runs on main and has not been rerun with this change. Review protections remain unchanged; this follows the repository's current rebase policy, including GitHub's rewriting of commit signatures during rebase.

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

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 ✅
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

@codecov

codecov Bot commented Nov 17, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (d0ed290) to head (031016c).

Additional details and impacted files
@@            Coverage Diff            @@
##              main      #338   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            9         9           
  Lines          179       179           
  Branches        38        38           
=========================================
  Hits           179       179           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@neilime
neilime merged commit 8b90d86 into main Nov 17, 2026
52 checks passed
@neilime
neilime deleted the fix/docs-merge-method-20261117 branch November 17, 2026 11:27
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