climaybe 1.5.2 → 1.6.0

package/src/workflows/single/post-merge-tag.yml

@@ -1,7 +1,7 @@
 # climaybe — Post-Merge Tag (Single-store & Multi-store)
-# After a staging → main PR is merged: detects target version from PR title, minor bump (e.g. v3.2.0).
-# After staging-<store> or live-<store> is synced to main (multistore-hotfix-to-main): patch bump (e.g. v3.2.1).
-# Version format is always three-part: v3.2.0. PR title convention for release: "Release v3.2" or "Release v3.2.0"
+# Only handles staging → main: minor bump from latest tag (e.g. v3.1.13 → v3.2.0).
+# No version in code or PR title; system infers from latest tag.
+# Hotfix / non-staging merges are tagged by the nightly workflow (02:00 US Eastern), not here.
 
 name: Post-Merge Tag
 
@@ -19,131 +19,109 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       is_release: ${{ steps.check.outputs.is_release }}
-      version: ${{ steps.check.outputs.version }}
-      is_hotfix_backport: ${{ steps.check.outputs.is_hotfix_backport }}
     steps:
-      - name: Check if this push is from a merged staging PR or hotfix backport
+      - name: Check if this push is from a merged staging → main PR
         id: check
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Check the commit message for merge indicator
           COMMIT_MSG=$(echo "${{ github.event.head_commit.message }}" | head -1)
 
-          # Skip version bump commits from this workflow (avoid loop)
           if echo "$COMMIT_MSG" | grep -q "chore(release): bump version"; then
             echo "Skipping post-merge tag: version bump commit."
             echo "is_release=false" >> $GITHUB_OUTPUT
-            echo "is_hotfix_backport=false" >> $GITHUB_OUTPUT
             exit 0
           fi
 
-          # Automatic hotfix sync (multistore-hotfix-to-main merge commit)
-          if echo "$COMMIT_MSG" | grep -q "\[hotfix-backport\]"; then
+          PR_NUMBER=$(echo "$COMMIT_MSG" | grep -oP '#\K\d+' | head -1 || true)
+          if [ -z "$PR_NUMBER" ]; then
+            echo "Skipping post-merge tag: no PR number in merge commit."
             echo "is_release=false" >> $GITHUB_OUTPUT
-            echo "is_hotfix_backport=true" >> $GITHUB_OUTPUT
-            echo "Detected hotfix backport merge, will trigger patch bump."
             exit 0
           fi
 
-          # Look for merged PR that targeted main
-          PR_NUMBER=$(echo "$COMMIT_MSG" | grep -oP '#\K\d+' | head -1 || true)
-
-          if [ -n "$PR_NUMBER" ]; then
-            PR_DATA=$(gh api repos/${{ github.repository }}/pulls/$PR_NUMBER 2>/dev/null || echo "")
-
-            if [ -n "$PR_DATA" ]; then
-              HEAD_REF=$(echo "$PR_DATA" | jq -r '.head.ref')
-              TITLE=$(echo "$PR_DATA" | jq -r '.title')
-
-              # Staging → main: release (minor bump)
-              if [ "$HEAD_REF" = "staging" ]; then
-                VERSION=$(echo "$TITLE" | grep -oP 'v\d+\.\d+(\.\d+)?' || true)
-                if [ -n "$VERSION" ]; then
-                  PARTS=$(echo "$VERSION" | tr '.' '\n' | wc -l)
-                  if [ "$PARTS" -eq "2" ]; then
-                    VERSION="${VERSION}.0"
-                  fi
-                  echo "is_release=true" >> $GITHUB_OUTPUT
-                  echo "version=$VERSION" >> $GITHUB_OUTPUT
-                  echo "is_hotfix_backport=false" >> $GITHUB_OUTPUT
-                  echo "Detected release version: $VERSION"
-                  exit 0
-                fi
-                echo "Skipping post-merge tag: staging PR title missing release version."
-              fi
-
-              # live-<store> → main: hotfix backport (patch bump)
-              if [[ "$HEAD_REF" == live-* ]]; then
-                echo "is_release=false" >> $GITHUB_OUTPUT
-                echo "is_hotfix_backport=true" >> $GITHUB_OUTPUT
-                echo "Detected hotfix backport from $HEAD_REF, will trigger patch bump."
-                exit 0
-              fi
-            fi
+          PR_DATA=$(gh api repos/${{ github.repository }}/pulls/$PR_NUMBER 2>/dev/null || echo "")
+          if [ -z "$PR_DATA" ]; then
+            echo "Skipping post-merge tag: could not load PR."
+            echo "is_release=false" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
-          echo "Skipping post-merge tag: push is not a merged staging release or hotfix backport PR."
-          echo "is_release=false" >> $GITHUB_OUTPUT
-          echo "is_hotfix_backport=false" >> $GITHUB_OUTPUT
+          HEAD_REF=$(echo "$PR_DATA" | jq -r '.head.ref')
+          if [ "$HEAD_REF" = "staging" ]; then
+            echo "is_release=true" >> $GITHUB_OUTPUT
+            echo "Detected staging → main merge; will minor bump from latest tag."
+          else
+            echo "Skipping post-merge tag: push is not a staging → main merge (head: $HEAD_REF)."
+            echo "is_release=false" >> $GITHUB_OUTPUT
+          fi
 
-  # Generate changelog for the release
-  changelog:
+  # Resolve latest tag on main for changelog base
+  release-base:
     needs: detect
     if: needs.detect.outputs.is_release == 'true'
-    uses: ./.github/workflows/ai-changelog.yml
-    with:
-      base_ref: ${{ needs.detect.outputs.version }}
-      head_ref: HEAD
-    secrets:
-      GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-
-  # Apply version bump (minor for release)
-  bump:
-    needs: [detect, changelog]
-    if: needs.detect.outputs.is_release == 'true'
-    uses: ./.github/workflows/version-bump.yml
-    with:
-      bump_type: minor
-      version: ${{ needs.detect.outputs.version }}
-      changelog: ${{ needs.changelog.outputs.changelog }}
-    secrets: inherit
-
-  # Resolve last tag for hotfix changelog (base_ref)
-  hotfix-base:
-    needs: detect
-    if: needs.detect.outputs.is_hotfix_backport == 'true'
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     outputs:
       last_tag: ${{ steps.tag.outputs.last_tag }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Get latest tag
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+      - name: Get latest tag (or create from settings_schema.json)
         id: tag
         run: |
-          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+          if [ -z "$LAST_TAG" ]; then
+            SCHEMA="config/settings_schema.json"
+            if [ -f "$SCHEMA" ]; then
+              LAST_TAG=$(node -e "
+                const fs = require('fs');
+                const arr = JSON.parse(fs.readFileSync('$SCHEMA', 'utf-8'));
+                const info = arr.find(x => x.name === 'theme_info');
+                const v = (info && info.theme_version) ? String(info.theme_version).trim() : '';
+                if (!v) process.exit(1);
+                let parts = v.replace(/^v/i, '').split('.');
+                if (parts.length === 2) parts.push('0');
+                if (parts.length < 3) parts = parts.concat(Array(3 - parts.length).fill('0')).slice(0, 3);
+                console.log('v' + parts.slice(0, 3).join('.'));
+              " 2>/dev/null || true)
+            fi
+            if [ -z "$LAST_TAG" ]; then
+              LAST_TAG="v0.0.0"
+            fi
+            if ! git rev-parse -q --verify "refs/tags/$LAST_TAG" >/dev/null; then
+              git tag -a "$LAST_TAG" -m "Initial version from settings_schema.json"
+              git push origin "$LAST_TAG"
+              echo "Created initial tag $LAST_TAG from settings_schema.json"
+            fi
+          fi
           echo "last_tag=$LAST_TAG" >> $GITHUB_OUTPUT
-          echo "Base ref for hotfix changelog: $LAST_TAG"
+          echo "Changelog base: $LAST_TAG"
 
-  # Generate changelog for hotfix (since last tag)
-  changelog-hotfix:
-    needs: [detect, hotfix-base]
-    if: needs.detect.outputs.is_hotfix_backport == 'true'
+  # Generate changelog (commits since last tag)
+  changelog:
+    needs: [detect, release-base]
+    if: needs.detect.outputs.is_release == 'true'
     uses: ./.github/workflows/ai-changelog.yml
     with:
-      base_ref: ${{ needs.hotfix-base.outputs.last_tag }}
+      base_ref: ${{ needs.release-base.outputs.last_tag }}
       head_ref: HEAD
     secrets:
       GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
 
-  # Apply patch version bump after hotfix backport merge
-  bump-hotfix:
-    needs: [detect, hotfix-base, changelog-hotfix]
-    if: needs.detect.outputs.is_hotfix_backport == 'true'
+  # Minor bump from latest tag (no explicit version; auto v3.1.x → v3.2.0)
+  bump:
+    needs: [detect, release-base, changelog]
+    if: needs.detect.outputs.is_release == 'true'
     uses: ./.github/workflows/version-bump.yml
     with:
-      bump_type: patch
-      changelog: ${{ needs.changelog-hotfix.outputs.changelog }}
+      bump_type: minor
+      changelog: ${{ needs.changelog.outputs.changelog }}
     secrets: inherit

package/src/workflows/single/release-pr-check.yml

@@ -1,7 +1,8 @@
 # climaybe — Release PR Check (Single-store)
-# Runs when a PR is opened from staging → main.
-# Generates an AI changelog, creates a pre-release patch tag to lock the current state,
-# and posts the changelog as a PR comment.
+# Runs when a PR is opened from staging → main (status check).
+# Finds latest tag on main (e.g. v3.1.12), generates changelog from that tag to PR head,
+# creates a pre-release patch tag (e.g. v3.1.13) on main to lock "last v3.1.x" before merge.
+# No version in code or PR title; after merge, post-merge-tag does minor bump (v3.1.13 → v3.2.0).
 
 name: Release PR Check
 
@@ -55,7 +56,32 @@ jobs:
       - name: Create pre-release patch tag
         id: tag
         run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+          if [ -z "$LATEST_TAG" ]; then
+            # No tags: use theme_version from config/settings_schema.json and push as initial tag
+            SCHEMA="config/settings_schema.json"
+            if [ -f "$SCHEMA" ]; then
+              LATEST_TAG=$(node -e "
+                const fs = require('fs');
+                const arr = JSON.parse(fs.readFileSync('$SCHEMA', 'utf-8'));
+                const info = arr.find(x => x.name === 'theme_info');
+                const v = (info && info.theme_version) ? String(info.theme_version).trim() : '';
+                if (!v) process.exit(1);
+                let parts = v.replace(/^v/i, '').split('.');
+                if (parts.length === 2) parts.push('0');
+                if (parts.length < 3) parts = parts.concat(Array(3 - parts.length).fill('0')).slice(0, 3);
+                console.log('v' + parts.slice(0, 3).join('.'));
+              " 2>/dev/null || true)
+            fi
+            if [ -z "$LATEST_TAG" ]; then
+              LATEST_TAG="v0.0.0"
+            fi
+            if ! git rev-parse -q --verify "refs/tags/$LATEST_TAG" >/dev/null; then
+              git tag -a "$LATEST_TAG" -m "Initial version from settings_schema.json"
+              git push origin "$LATEST_TAG"
+              echo "Created initial tag $LATEST_TAG from settings_schema.json"
+            fi
+          fi
           echo "last_tag=$LATEST_TAG" >> $GITHUB_OUTPUT
 
           # Check if there are commits since the last tag