feat: sync config/** from main → data on every config change, committing to data

Author: productStripesAdmin

.github/SETUP.md

@@ -32,6 +32,38 @@ Only needed if you want cross-repo commits (e.g., pushing to YogaMatLabApp).
    - Value: Your personal access token
    - Click **Add secret**
 
+### 3. (Optional, recommended) Set up BRANDS_SYNC_TOKEN
+
+Only needed if you want `config/brands.json` changes to automatically sync into your app repo via `.github/workflows/update-brands.yml`.
+
+This token must have access to the *target repo* (by default `productStripesAdmin/YogaMatLabApp`).
+
+1. Create a Personal Access Token:
+   - Recommended: **Tokens (classic)** with scope `repo` (private repos)
+   - Alternative: fine-grained token that has access to the target repo and can trigger workflows / dispatch events
+
+2. Add to this repository:
+   - Go to repository Settings → Secrets and variables → Actions
+   - Click **New repository secret**
+   - Name: `BRANDS_SYNC_TOKEN`
+   - Value: Your token
+   - Click **Add secret**
+
+### 4. (Optional) Configure target repo variables
+
+If the app repo is not `productStripesAdmin/YogaMatLabApp`, set these repository variables (Settings → Secrets and variables → Actions → **Variables**):
+
+- `BRANDS_SYNC_TARGET_OWNER` (defaults to this repo owner)
+- `BRANDS_SYNC_TARGET_REPO` (defaults to `YogaMatLabApp`)
+- `BRANDS_SYNC_TARGET_BRANCH` (defaults to `main`)
+- `BRANDS_SYNC_TARGET_PATH` (defaults to `config/brands.json`)
+
+## Config Sync to data branch
+
+If YogaMatLabApp consumes this repo via a submodule tracking the `data` branch (common for production), the `config/` directory also needs to be kept up to date there.
+
+This repo includes `.github/workflows/sync-config-to-data-branch.yml`, which syncs `config/**` from `main` → `data` on every config change.
+
 ## Testing the Workflow
 
 ### Manual Trigger

.github/workflows/sync-config-to-data-branch.yml

@@ -0,0 +1,60 @@
+name: Sync config/ to data branch
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'config/**'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PAT_TOKEN || github.token }}
+
+      - name: Sync config/ into data branch
+        run: |
+          set -euo pipefail
+
+          DATA_BRANCH="data"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          # Prepare a separate worktree for the data branch so main stays clean.
+          git fetch origin "${DATA_BRANCH}" || true
+          rm -rf ../data-branch
+
+          if git show-ref --verify --quiet "refs/remotes/origin/${DATA_BRANCH}"; then
+            git worktree add ../data-branch "origin/${DATA_BRANCH}"
+          else
+            git worktree add ../data-branch --detach
+            cd ../data-branch
+            git checkout --orphan "${DATA_BRANCH}"
+            git rm -rf . || true
+            cd -
+          fi
+
+          rsync -a --delete --exclude '.git' config/ ../data-branch/config/
+
+          cd ../data-branch
+          git add -A config/
+
+          if git diff --staged --quiet; then
+            echo "## ✅ config/ already up to date on ${DATA_BRANCH}" >> "$GITHUB_STEP_SUMMARY"
+            exit 0
+          fi
+
+          git commit -m "chore: sync config into data branch (${GITHUB_SHA::7})"
+          git push origin HEAD:"${DATA_BRANCH}"
+
+          echo "## ✅ Synced config/ to ${DATA_BRANCH} branch" >> "$GITHUB_STEP_SUMMARY"

.github/workflows/update-brands.yml

@@ -1,29 +1,78 @@
-name: Trigger Brands Update
+name: Sync brands.json to app repo
 
 on:
   push:
     branches:
       - main
     paths:
       - 'config/brands.json'
-      - 'data/**'
+  workflow_dispatch:
 
 jobs:
-  trigger-update:
+  sync:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
 
     steps:
-      - name: Trigger YogaMatLabApp submodule update
+      - name: Preflight (ensure token configured)
+        if: ${{ !secrets.BRANDS_SYNC_TOKEN && !secrets.PAT_TOKEN }}
         run: |
-          curl -X POST \
-            -H "Accept: application/vnd.github.v3+json" \
-            -H "Authorization: token ${{ secrets.PAT_TOKEN }}" \
-            https://api.github.com/repos/productStripesAdmin/YogaMatLabApp/dispatches \
-            -d '{"event_type":"data-updated"}'
+          echo "Missing required token." >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "Set BRANDS_SYNC_TOKEN (recommended) or PAT_TOKEN with access to the target repo." >> "$GITHUB_STEP_SUMMARY"
+          exit 1
 
-      - name: Summary
+      - name: Checkout YogaMatLabData
+        uses: actions/checkout@v4
+        with:
+          path: source
+
+      - name: Checkout target app repo
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ format('{0}/{1}', vars.BRANDS_SYNC_TARGET_OWNER || github.repository_owner, vars.BRANDS_SYNC_TARGET_REPO || 'YogaMatLabApp') }}
+          ref: ${{ vars.BRANDS_SYNC_TARGET_BRANCH || 'main' }}
+          token: ${{ secrets.BRANDS_SYNC_TOKEN || secrets.PAT_TOKEN }}
+          path: target
+
+      - name: Copy brands.json into target repo
+        env:
+          TARGET_OWNER: ${{ vars.BRANDS_SYNC_TARGET_OWNER || github.repository_owner }}
+          TARGET_REPO: ${{ vars.BRANDS_SYNC_TARGET_REPO || 'YogaMatLabApp' }}
+          TARGET_BRANCH: ${{ vars.BRANDS_SYNC_TARGET_BRANCH || 'main' }}
+          TARGET_PATH: ${{ vars.BRANDS_SYNC_TARGET_PATH || 'config/brands.json' }}
         run: |
-          echo "## ✅ Webhook Sent" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "Triggered YogaMatLabApp to update its data submodule." >> $GITHUB_STEP_SUMMARY
-          echo "Check the workflow run at: https://github.com/productStripesAdmin/YogaMatLabApp/actions" >> $GITHUB_STEP_SUMMARY
+          set -euo pipefail
+
+          if [ ! -f "source/config/brands.json" ]; then
+            echo "Expected file not found: source/config/brands.json"
+            exit 1
+          fi
+
+          mkdir -p "target/$(dirname "$TARGET_PATH")"
+          cp "source/config/brands.json" "target/$TARGET_PATH"
+
+          cd target
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git add "$TARGET_PATH"
+
+          if git diff --staged --quiet; then
+            echo "No changes to commit."
+            echo "## ✅ brands.json already up to date" >> "$GITHUB_STEP_SUMMARY"
+            echo "" >> "$GITHUB_STEP_SUMMARY"
+            echo "Target: ${TARGET_OWNER}/${TARGET_REPO}@${TARGET_BRANCH}" >> "$GITHUB_STEP_SUMMARY"
+            echo "Path: ${TARGET_PATH}" >> "$GITHUB_STEP_SUMMARY"
+            exit 0
+          fi
+
+          git commit -m "chore: sync brands.json from YogaMatLabData (${GITHUB_SHA::7})"
+          git push origin "HEAD:${TARGET_BRANCH}"
+
+          echo "## ✅ Synced brands.json to target repo" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "Target: ${TARGET_OWNER}/${TARGET_REPO}@${TARGET_BRANCH}" >> "$GITHUB_STEP_SUMMARY"
+          echo "Path: ${TARGET_PATH}" >> "$GITHUB_STEP_SUMMARY"