Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions .github/workflows/sync-beta.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
name: Sync beta ← master
# After deploy succeeds on master, merge master back into beta so both branches
# stay aligned. Uses GITHUB_TOKEN (default) for the push β€” this intentionally
# does NOT trigger auto-pr.yml (GitHub skips workflows triggered by GITHUB_TOKEN).

on:
workflow_run:
Expand All @@ -26,22 +23,29 @@ jobs:
with:
fetch-depth: 0

- name: Configure Git identity
- name: Configure Git
run: |
git config user.name "github-actions"
git config user.email "actions@github.com"

- name: Show commits that will be lost on beta
- name: Fetch branches
run: |
echo "=== Commits on beta NOT on master (will be overwritten) ==="
git log origin/master..origin/beta --oneline || echo "(none β€” beta is already up to date with master)"
echo "============================================================"
git fetch origin master
git fetch origin beta

- name: Sync master β†’ beta (force reset)
- name: Show overwritten commits
run: |
git fetch origin
git checkout beta
git reset --hard origin/master
echo "=== Overwritten commits ==="
git log origin/master..origin/beta --oneline || echo "(none)"
echo "==========================="

- name: Sync beta to master
run: |
git checkout -B beta origin/master
git push origin beta --force
echo "βœ“ beta now matches master exactly"
git log --oneline -3
echo "βœ“ beta synced"

- name: Verify
run: |
git fetch origin
git log origin/beta -3 --oneline
1 change: 0 additions & 1 deletion apps/api/scripts/deploy-bluegreen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@ if [ "$_RUNNING_IMAGE" = "$IMAGE" ]; then
_ft_log "msg='SHA differs from running image -- proceeding' running=${_RUNNING_IMAGE:-none} target=$IMAGE"
fi
unset _RUNNING_IMAGE
fi

# ---------------------------------------------------------------------------
# [3/7] START INACTIVE CONTAINER
Expand Down
1 change: 0 additions & 1 deletion apps/api/scripts/validate-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ REQUIRED_API_VARS=(
API_BASE_URL
CORS_ORIGIN
SUPABASE_URL
SUPABASE_JWT_SECRET
REDIS_URL
METRICS_SCRAPE_TOKEN
)
Expand Down
Loading