File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11name : Sync beta ← master
2- # After deploy succeeds on master, merge master back into beta so both branches
3- # stay aligned. Uses GITHUB_TOKEN (default) for the push — this intentionally
4- # does NOT trigger auto-pr.yml (GitHub skips workflows triggered by GITHUB_TOKEN).
52
63on :
74 workflow_run :
@@ -26,22 +23,29 @@ jobs:
2623 with :
2724 fetch-depth : 0
2825
29- - name : Configure Git identity
26+ - name : Configure Git
3027 run : |
3128 git config user.name "github-actions"
3229 git config user.email "actions@github.com"
3330
34- - name : Show commits that will be lost on beta
31+ - name : Fetch branches
3532 run : |
36- echo "=== Commits on beta NOT on master (will be overwritten) ==="
37- git log origin/master..origin/beta --oneline || echo "(none — beta is already up to date with master)"
38- echo "============================================================"
33+ git fetch origin master
34+ git fetch origin beta
3935
40- - name : Sync master → beta (force reset)
36+ - name : Show overwritten commits
4137 run : |
42- git fetch origin
43- git checkout beta
44- git reset --hard origin/master
38+ echo "=== Overwritten commits ==="
39+ git log origin/master..origin/beta --oneline || echo "(none)"
40+ echo "==========================="
41+
42+ - name : Sync beta to master
43+ run : |
44+ git checkout -B beta origin/master
4545 git push origin beta --force
46- echo "✓ beta now matches master exactly"
47- git log --oneline -3
46+ echo "✓ beta synced"
47+
48+ - name : Verify
49+ run : |
50+ git fetch origin
51+ git log origin/beta -3 --oneline
Original file line number Diff line number Diff line change @@ -469,7 +469,6 @@ if [ "$_RUNNING_IMAGE" = "$IMAGE" ]; then
469469 _ft_log " msg='SHA differs from running image -- proceeding' running=${_RUNNING_IMAGE:- none} target=$IMAGE "
470470 fi
471471 unset _RUNNING_IMAGE
472- fi
473472
474473# ---------------------------------------------------------------------------
475474# [3/7] START INACTIVE CONTAINER
Original file line number Diff line number Diff line change @@ -119,7 +119,6 @@ REQUIRED_API_VARS=(
119119 API_BASE_URL
120120 CORS_ORIGIN
121121 SUPABASE_URL
122- SUPABASE_JWT_SECRET
123122 REDIS_URL
124123 METRICS_SCRAPE_TOKEN
125124)
You can’t perform that action at this time.
0 commit comments