From 40ed63b8ff701cb5a27af7135c11467864cee819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Plaza=20Sisqu=C3=A9s?=
 <44029214+JSisques@users.noreply.github.com>
Date: Mon, 31 Aug 2026 15:34:18 +0200
Subject: [PATCH] ci(release): sync main back into develop/staging after stable
 releases (#4)

semantic-release runs independently per branch here, each committing its
own version bump (package.json/CHANGELOG.md) with no relation to the
others, so develop/staging permanently diverged from main and every
later promotion PR conflicted on those files. node-release.yml now
supports merging main back down after a stable release
(sisques-labs/workflows#66); opt in via sync_develop_after_stable and
sync_staging_after_stable.
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f51ef8..98fa7a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,3 +32,5 @@ jobs:
     with:
       node_version: "24"
       build_command: "build"
+      sync_develop_after_stable: true
+      sync_staging_after_stable: true