climaybe 1.6.0 → 1.6.2

package/README.md

@@ -185,7 +185,7 @@ Direct pushes to `staging-<store>` or `live-<store>` are automatically synced ba
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|
-| `main-to-staging-stores.yml` (main-to-staging-&lt;store&gt;) | Push to `main` | Merges main into each `staging-<alias>`; root JSONs ignored (restored from stores/). Skips on hotfix/version/sync commits |
+| `main-to-staging-stores.yml` (main-to-staging-&lt;store&gt;) | Push to `main` | Merges main into each `staging-<alias>`; root JSONs ignored. For hotfix-backport, skips the store that sent the hotfix; other stores get the merge. Skips only on pure store-sync. |
 | `stores-to-root.yml` | Push to `staging-*` | From main merge: stores→root. From elsewhere (e.g. Shopify): root→stores |
 | `pr-to-live.yml` | After stores-to-root | Opens PR from `staging-<alias>` to `live-<alias>` |
 | `root-to-stores.yml` | Push to `live-*` | From main merge: stores→root. From elsewhere: root→stores (same as stores-to-root on staging-*) |
@@ -221,7 +221,8 @@ Enabled via `climaybe init` prompt (`Enable build + Lighthouse workflows?`).
 - **No tags yet?** The system uses `theme_version` from `config/settings_schema.json` (`theme_info`), creates that tag on main (e.g. `v1.0.0`), and continues from there.
 - **Staging → main**: On PR, a pre-release patch tag (e.g. v3.1.13) locks the current minor line; on merge, **minor** bump (e.g. v3.1.13 → v3.2.0).
 - **Non-staging to main** (hotfix backports, direct commits): **Patch** bump only, via **nightly workflow** at 02:00 US Eastern (not at commit time).
-- All version bumps update `config/settings_schema.json` automatically.
+- **Version bump runs only on main** (post-merge-tag and nightly-hotfix). Main-to-staging-stores merges main into each `staging-<alias>` on every push (version bumps and hotfixes). When the push is a hotfix from one store (e.g. live-norway), that store’s staging branch is skipped; other stores’ staging branches still get the merge.
+- Version bumps update `config/settings_schema.json` and, when present, `package.json` `version`.
 
 **Full specification:** For detailed versioning rules, local dev flow, hotfix behavior, and alignment with the external CI/CD doc, see **[CI/CD Reference](docs/CI_CD_REFERENCE.md)**.
 

package/bin/version.txt

@@ -1 +1 @@
-1.6.0
+1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Shopify CI/CD CLI — scaffolds workflows, branch strategy, and store config for single-store and multi-store theme repos",
   "type": "module",
   "bin": {
@@ -39,7 +39,22 @@
       "main"
     ],
     "plugins": [
-      "@semantic-release/commit-analyzer",
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "preset": "conventionalcommits",
+          "releaseRules": [
+            {
+              "type": "ci",
+              "release": "patch"
+            },
+            {
+              "type": "chore",
+              "release": "patch"
+            }
+          ]
+        }
+      ],
       "@semantic-release/release-notes-generator",
       [
         "@semantic-release/npm",
@@ -54,7 +69,7 @@
             "package.json",
             "package-lock.json"
           ],
-          "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+          "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"
         }
       ]
     ]

package/src/workflows/multi/main-to-staging-stores.yml

@@ -2,13 +2,22 @@
 # When main is pushed (e.g. after staging→main merge), syncs main to each staging-<alias>.
 # Root JSON files (config/settings_data.json, templates/*.json, sections/*.json) are ignored:
 # merge brings main in but we immediately restore root from stores/<alias>/ so store-specific data is kept.
-# Skips [hotfix-backport], version-bump, and store-sync commits so hotfix syncs do not re-trigger release to stores.
+# Runs on every push to main except pure store-sync commits ([stores-to-root], [root-to-stores]), so that:
+# - Version-bump commits: staging-<alias> get the new version.
+# - Hotfix backports (live or staging-<alias> → main): other staging-<alias> get those changes; the store that sent the hotfix is skipped (no need to merge back to the same branch).
+#
+# Also runs when Post-Merge Tag or Nightly Hotfix Tag complete: version-bump pushes with GITHUB_TOKEN,
+# which does not trigger push-based workflows, so we explicitly run sync after those workflows finish.
 
 name: Main to Staging Stores
 
 on:
   push:
     branches: [main]
+  workflow_run:
+    workflows: ['Post-Merge Tag', 'Nightly Hotfix Tag']
+    types: [completed]
+    branches: [main]
 
 # Prevent concurrent store pushes
 concurrency:
@@ -16,30 +25,48 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  # Gate: skip hotfix backports and version bump commits
+  # Gate: skip only pure store-sync commits. When hotfix-backport, extract source branch alias so we skip merging back into that same store.
+  # When triggered by workflow_run (version-bump finished), run sync if the workflow succeeded.
   gate:
     runs-on: ubuntu-latest
+    # workflow_run: only sync when Post-Merge or Nightly Hotfix completed successfully (version-bump pushed)
+    if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
     outputs:
       should_run: ${{ steps.check.outputs.should_run }}
+      hotfix_source_alias: ${{ steps.check.outputs.hotfix_source_alias }}
     steps:
-      - name: Check commit message
+      - name: Check commit message and hotfix source
         id: check
         run: |
+          if [ "${{ github.event_name }}" = "workflow_run" ]; then
+            echo "Triggered by workflow_run (version-bump finished); syncing main to staging."
+            echo "should_run=true" >> $GITHUB_OUTPUT
+            echo "hotfix_source_alias=" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
           COMMIT_MSG="${{ github.event.head_commit.message }}"
 
-          if echo "$COMMIT_MSG" | grep -q "\[hotfix-backport\]"; then
-            echo "Skipping — hotfix backport commit (do not re-release to stores)"
-            echo "should_run=false" >> $GITHUB_OUTPUT
-          elif echo "$COMMIT_MSG" | grep -q "chore(release): bump version"; then
-            echo "Skipping — version bump commit"
+          if echo "$COMMIT_MSG" | grep -qE "\[skip-store-sync\]|\[stores-to-root\]|\[root-to-stores\]"; then
+            echo "Skipping — store sync commit (avoid loop)"
             echo "should_run=false" >> $GITHUB_OUTPUT
-          elif echo "$COMMIT_MSG" | grep -qE "\[skip-store-sync\]|\[stores-to-root\]|\[root-to-stores\]"; then
-            echo "Skipping — store sync commit"
-            echo "should_run=false" >> $GITHUB_OUTPUT
-          else
-            echo "should_run=true" >> $GITHUB_OUTPUT
+            echo "hotfix_source_alias=" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
+          echo "should_run=true" >> $GITHUB_OUTPUT
+
+          # If hotfix-backport, extract source branch alias (e.g. staging-norway or live-norway → norway) so we skip that store in sync
+          HOTFIX_SOURCE_ALIAS=""
+          if echo "$COMMIT_MSG" | grep -q "\[hotfix-backport\]"; then
+            SOURCE_BRANCH=$(echo "$COMMIT_MSG" | sed -n 's/.*Merge \([^ ]*\) into main.*/\1/p' | head -1)
+            if [ -n "$SOURCE_BRANCH" ]; then
+              HOTFIX_SOURCE_ALIAS="${SOURCE_BRANCH#staging-}"
+              HOTFIX_SOURCE_ALIAS="${HOTFIX_SOURCE_ALIAS#live-}"
+            fi
+          fi
+          echo "hotfix_source_alias=$HOTFIX_SOURCE_ALIAS" >> $GITHUB_OUTPUT
+
   # Read store list from package.json
   config:
     needs: gate
@@ -61,7 +88,7 @@ jobs:
           echo "stores=$STORES" >> $GITHUB_OUTPUT
           echo "Store aliases: $STORES"
 
-  # Merge main into each staging-<alias>; root JSONs ignored (restored from stores/<alias>/)
+  # Merge main into each staging-<alias>; root JSONs ignored (restored from stores/<alias>/). Skip the store that sent the hotfix (no need to merge back).
   sync:
     needs: [gate, config]
     if: needs.gate.outputs.should_run == 'true'
@@ -76,6 +103,7 @@ jobs:
       actions: write
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      HOTFIX_SOURCE_ALIAS: ${{ needs.gate.outputs.hotfix_source_alias }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -83,10 +111,16 @@ jobs:
 
       - name: Sync main to staging-${{ matrix.store }} (root JSONs ignored)
         run: |
+          git fetch origin main
           BRANCH="staging-${{ matrix.store }}"
           ALIAS="${{ matrix.store }}"
           STORE_DIR="stores/${ALIAS}"
 
+          if [ -n "$HOTFIX_SOURCE_ALIAS" ] && [ "$HOTFIX_SOURCE_ALIAS" = "$ALIAS" ]; then
+            echo "Hotfix came from staging-$ALIAS or live-$ALIAS, skipping (no need to merge back to same store)."
+            exit 0
+          fi
+
           if ! git ls-remote --heads origin "$BRANCH" | grep -q "$BRANCH"; then
             echo "Branch $BRANCH does not exist on remote, skipping."
             exit 0

package/src/workflows/shared/version-bump.yml

@@ -1,5 +1,6 @@
 # climaybe — Version Bump (Reusable Workflow)
-# Bumps version in settings_schema.json, creates a git tag, and pushes.
+# Bumps version in settings_schema.json and package.json (if present), creates a git tag, and pushes.
+# Only runs on main (called from post-merge-tag and nightly-hotfix). staging / staging-* / live-* do not run version bump.
 
 name: Version Bump
 
@@ -99,20 +100,20 @@ jobs:
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
           echo "New version: $NEW_VERSION"
 
-      - name: Update settings_schema.json
+      - name: Update settings_schema.json and package.json
+        env:
+          NEW_VERSION: ${{ steps.bump.outputs.new_version }}
         run: |
-          NEW_VERSION="${{ steps.bump.outputs.new_version }}"
+          export VERSION_PLAIN="${NEW_VERSION#v}"
           SCHEMA_FILE="config/settings_schema.json"
 
           if [ -f "$SCHEMA_FILE" ]; then
-            # Update the theme_info version in settings_schema.json
             node -e "
               const fs = require('fs');
+              const v = process.env.VERSION_PLAIN;
               const schema = JSON.parse(fs.readFileSync('$SCHEMA_FILE', 'utf-8'));
               const themeInfo = schema.find(s => s.name === 'theme_info');
-              if (themeInfo) {
-                themeInfo.theme_version = '${NEW_VERSION#v}';
-              }
+              if (themeInfo) themeInfo.theme_version = v;
               fs.writeFileSync('$SCHEMA_FILE', JSON.stringify(schema, null, 2) + '\n');
             "
             echo "Updated $SCHEMA_FILE to ${NEW_VERSION}"
@@ -120,6 +121,18 @@ jobs:
             echo "No $SCHEMA_FILE found, skipping schema update."
           fi
 
+          if [ -f "package.json" ]; then
+            node -e "
+              const fs = require('fs');
+              const pkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+              pkg.version = process.env.VERSION_PLAIN;
+              fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+            "
+            echo "Updated package.json version to ${VERSION_PLAIN}"
+          else
+            echo "No package.json found, skipping."
+          fi
+
       - name: Commit and tag
         run: |
           NEW_VERSION="${{ steps.bump.outputs.new_version }}"