Skip to content

ci: switch release flow to target develop directly - #67

Merged
JeanPhilippeKernel merged 1 commit into
developfrom
ci/release-on-develop
Aug 24, 2026
Merged

JeanPhilippeKernel merged 1 commit into
developfrom
ci/release-on-develop

Conversation

@JeanPhilippeKernel

Copy link
Copy Markdown
Owner

Problem

Every release cycle hit the same issues:

  • Merge conflicts between develop and main (diverged histories)
  • Release Please calculating the wrong version bump (only saw merge commits on main, not the individual feat:/fix: commits from develop)
  • Manual intervention needed every time to unblock

Root cause: Release Please scans main's first-parent linear history. Merging develop into main via a merge commit hides the conventional commits inside the second parent — Release Please never sees them.

Fix (Option B)

  • release-please.yml: trigger on push to develop, target-branch: develop
  • release-please-config.json: target-branch: develop

New release flow

  1. Feature PRs → develop (unchanged)
  2. Release Please runs on every develop push → opens chore: release X.Y.Z PR targeting develop
  3. Merge that PR → Release Please creates the tag on develop
  4. Tag push fires the publish pipeline → artifacts built and uploaded to GitHub release
  5. No develop → main PR needed. No merge conflicts. No version guessing.

main becomes a stable mirror — updated manually after each release if desired.

Release Please now triggers on push to develop and creates release PRs
against develop. Tags are created on develop commits; the existing
on:push:tags trigger fires the publish pipeline from there.

This eliminates the develop→main merge dance, merge conflicts, and
version bump mismatches that plagued every release cycle. main becomes
a read-only mirror updated manually after each stable release.
@JeanPhilippeKernel
JeanPhilippeKernel merged commit 7161a99 into develop Aug 24, 2026
20 checks passed
@JeanPhilippeKernel
JeanPhilippeKernel deleted the ci/release-on-develop branch August 24, 2026 04:41
@github-actions github-actions Bot mentioned this pull request Aug 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant