climaybe 3.4.0 → 3.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/bin/version.txt +1 -1
  2. package/package.json +1 -1
  3. package/src/workflows/multi/multistore-hotfix-to-main.yml +10 -4
package/bin/version.txt CHANGED
@@ -1 +1 @@
1
- 3.4.0
1
+ 3.4.1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "climaybe",
3
- "version": "3.4.0",
3
+ "version": "3.4.1",
4
4
  "description": "Shopify CLI by Electric Maybe for theme CI/CD workflows, branch orchestration, app setup, and dev tooling",
5
5
  "type": "module",
6
6
  "bin": {
package/src/workflows/multi/multistore-hotfix-to-main.yml CHANGED
@@ -94,16 +94,22 @@ jobs:
94
94
 
95
95
  # Default store: commits outside stores/ and assets/ trigger backport.
96
96
  # Live-branch minified assets should never backport into main.
97
- # Non-default store: only commits under stores/<alias>/ trigger backport; root JSON must not overwrite main.
98
97
  if [ -n "$DEFAULT_ALIAS" ] && [ "$SOURCE_ALIAS" = "$DEFAULT_ALIAS" ]; then
99
98
  COMMITS=$(git log --oneline ${MERGE_BASE}..origin/$SOURCE -- . ':!stores/' ':!assets/' 2>/dev/null | \
100
99
  grep -v "\[stores-to-root\]" | grep -v "\[root-to-stores\]" | grep -v "chore(release)" | grep -v "chore(assets)" || true)
101
100
  else
102
- COMMITS=$(git log --oneline ${MERGE_BASE}..origin/$SOURCE -- "stores/${SOURCE_ALIAS}/" 2>/dev/null | \
103
- grep -v "\[stores-to-root\]" | grep -v "\[root-to-stores\]" | grep -v "chore(release)" || true)
101
+ COMMITS=""
104
102
  fi
105
103
 
106
- if [ -n "$COMMITS" ]; then
104
+ # Store-specific changes (including root-to-stores sync commits) must
105
+ # backport immediately. Use tree-diff detection so commit-message
106
+ # filtering cannot hide valid changes.
107
+ STORE_CHANGED=""
108
+ if ! git diff --quiet "$MERGE_BASE" "origin/$SOURCE" -- "stores/${SOURCE_ALIAS}/"; then
109
+ STORE_CHANGED="yes"
110
+ fi
111
+
112
+ if [ -n "$COMMITS" ] || [ -n "$STORE_CHANGED" ]; then
107
113
  # Skip no-op history merges when source and main already have identical content.
108
114
  MAIN_TREE=$(git rev-parse origin/main^{tree} 2>/dev/null || echo "")
109
115
  SOURCE_TREE=$(git rev-parse origin/$SOURCE^{tree} 2>/dev/null || echo "")