Skip to content

fix(release): develop to main - #543

Merged
bedatty merged 2 commits into
mainfrom
develop
Jul 3, 2026
Merged

fix(release): develop to main#543
bedatty merged 2 commits into
mainfrom
develop

Conversation

@bedatty

@bedatty bedatty commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
Lerian

GitHub Actions Shared Workflows


Description

Type of Change

  • feat: New workflow or new input/output/step in an existing workflow
  • fix: Bug fix in a workflow (incorrect behavior, broken step, wrong condition)
  • perf: Performance improvement (e.g. caching, parallelism, reduced steps)
  • refactor: Internal restructuring with no behavior change
  • docs: Documentation only (README, docs/, inline comments)
  • ci: Changes to self-CI (workflows under .github/workflows/ that run on this repo)
  • chore: Dependency bumps, config updates, maintenance
  • test: Adding or updating tests
  • BREAKING CHANGE: Callers must update their configuration after this PR

Breaking Changes

None.

Testing

  • YAML syntax validated locally
  • Triggered a real workflow run on a caller repository using @this-branch or the beta tag
  • Verified all existing inputs still work with default values
  • Confirmed no secrets or tokens are printed in logs
  • Checked that unrelated workflows are not affected

Caller repo / workflow run:

Related Issues

Closes #

bedatty and others added 2 commits July 3, 2026 14:23
…efault false)

backmerge_enabled currently gates two unrelated behaviors under one flag:
1. the post-release backmerge on backmerge_source (e.g. main) right after
   a stable release — proactive, low blast radius (only runs when a
   release just happened on that branch).
2. the pre-version-calculation sync on prerelease branches (develop,
   release-candidate) — reactive, can skip/block a release on ANY push to
   those branches if backmerge_source has diverged, regardless of what the
   triggering commit actually touched.

Callers who want (1) without (2) had no way to disable just the reactive
part — backmerge_enabled: false disables both.

Adds prerelease_backmerge_sync_enabled, defaulting to false (opt-in), to
independently gate the pre_sync step in release.yml, and exposes it as a
pass-through input in go-release.yml. Defaulting to false means existing
callers stop being subject to this pre-version-calculation sync/skip
unless they explicitly opt in with true; the post-release backmerge on
backmerge_source is unaffected either way.

Also documents the pre-existing (undocumented) prerelease_branches input
in docs/release-workflow.md while touching that table.
@bedatty
bedatty requested a review from a team as a code owner July 3, 2026 17:32
@coderabbitai

coderabbitai Bot commented Jul 3, 2026

Copy link
Copy Markdown

Review Change Stack

Summary by CodeRabbit

  • New Features
    • Added an optional setting to control prerelease branch sync behavior before version calculation.
    • Expanded release workflow documentation with new input options and defaults for prerelease handling.
  • Bug Fixes
    • Updated prerelease release runs to perform the backmerge sync only when explicitly enabled, giving more predictable release behavior.

Walkthrough

Adds a new opt-in boolean workflow input, prerelease_backmerge_sync_enabled (default false), to go-release.yml and release.yml, gating the prerelease pre-version backmerge sync step. go-release.yml forwards the input to release.yml. Documentation updated with the new input plus prerelease_branches.

Changes

Prerelease Backmerge Sync Gating

Layer / File(s) Summary
Gating condition update
.github/workflows/release.yml
Adds prerelease_backmerge_sync_enabled workflow_call input (default false) and updates the prerelease backmerge sync step's if: condition to also require this input, in addition to backmerge_enabled and prerelease classification.
Input passthrough and docs
.github/workflows/go-release.yml, docs/release-workflow.md
go-release.yml declares the same input and passes it to release.yml's with: block; docs table adds rows for prerelease_backmerge_sync_enabled and prerelease_branches with their defaults.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

Suggested labels: documentation, workflow, size/S

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Description check ⚠️ Warning The template is mostly unfilled: the Description, Testing, and Related Issues sections lack the required project-specific details. Add a concrete summary of affected workflows and behavior, include validation steps or run links, and complete or remove the Related Issues section.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title is concise and matches the release workflow/backmerge fix, though it is narrower than the full change set.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch develop

Comment @coderabbitai help to get the list of available commands.

@lerian-studio lerian-studio added size/XS PR changes < 50 lines documentation Improvements or additions to documentation workflow Changes to one or more reusable workflow files golang Changes to Go-related workflows labels Jul 3, 2026
@lerian-studio

Copy link
Copy Markdown
Contributor

🔍 PR Validation Summary

✅ PR Mergeable — no blocking failures

Check Status Blocking
Source Branch ✅ success yes
PR Title ✅ success yes
PR Description ✅ success yes
PR Size ✅ success no
Auto Labels ✅ success no
PR Metadata ✅ success no

🔍 View workflow run

@lerian-studio

Copy link
Copy Markdown
Contributor

🔍 Lint Analysis

Check Files Scanned Status
YAML Lint 2 file(s) ✅ success
Action Lint 2 file(s) ✅ success
Pinned Actions 2 file(s) ✅ success
Markdown Link Check 1 file(s) ✅ success
Spelling Check 3 file(s) ✅ success
Shell Check 2 file(s) ✅ success
README Check 2 file(s) ✅ success
Composite Schema no changes ⏭️ skipped
Deployment Matrix no changes ⏭️ skipped

🔍 View full scan logs

@lerian-studio

Copy link
Copy Markdown
Contributor

🛡️ CodeQL Analysis Results

Languages analyzed: actions

✅ No security issues found.


🔍 View full scan logs | 🛡️ Security tab

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Warning

CodeRabbit couldn't request changes on this pull request because it doesn't have sufficient GitHub permissions.

Please grant CodeRabbit Pull requests: Read and write permission and re-run the review.

👉 Steps to fix this

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In @.github/workflows/release.yml:
- Around line 102-106: The prerelease backmerge sync is still being gated by
backmerge_enabled, so the new prerelease_backmerge_sync_enabled input is not
actually independent. Update the release workflow logic in the release job guard
that references prerelease_backmerge_sync_enabled to remove the
backmerge_enabled dependency, or else revise the input description and related
passthrough/docs to clearly state the sync only runs when backmerge_enabled is
true. Use the prerelease_backmerge_sync_enabled input and the existing
backmerge_enabled condition in release.yml to locate the check.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yml

Review profile: ASSERTIVE

Plan: Pro

Run ID: ca411f23-2f0f-4fd5-860a-1fcafaa92a61

📥 Commits

Reviewing files that changed from the base of the PR and between bb2f9cb and 5a16149.

📒 Files selected for processing (3)
  • .github/workflows/go-release.yml
  • .github/workflows/release.yml
  • docs/release-workflow.md

Comment thread .github/workflows/release.yml
@bedatty
bedatty merged commit 9eaf034 into main Jul 3, 2026
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation golang Changes to Go-related workflows size/XS PR changes < 50 lines workflow Changes to one or more reusable workflow files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants