fix(ci): align supabase worktree env in tests

Author: riderx

.github/workflows/tests.yml

@@ -63,18 +63,20 @@ jobs:
           version: latest
       - name: Show Supabase CLI version
         run: supabase --version
+      - name: Configure worktree Supabase env
+        run: ./scripts/with-worktree-supabase-env.sh --print-env >> "$GITHUB_ENV"
       - name: Run Supabase Start
-        run: supabase start -x imgproxy,studio,mailpit,realtime,postgres-meta,supavisor,studio,logflare,vector,realtime
+        run: ./scripts/with-worktree-supabase-env.sh supabase start -x imgproxy,studio,mailpit,realtime,postgres-meta,supavisor,studio,logflare,vector,realtime
       - name: Run Supabase Test DB
-        run: supabase test db
+        run: ./scripts/with-worktree-supabase-env.sh supabase test db
       - name: Lint SQL
-        run: supabase db lint -s public --fail-on warning
+        run: ./scripts/with-worktree-supabase-env.sh supabase db lint -s public --fail-on warning
       - uses: JarvusInnovations/background-action@2428e7b970a846423095c79d43f759abf979a635 # v1
         name: Bootstrap Edge server
         with:
-          run: supabase functions serve &
+          run: ./scripts/with-worktree-supabase-env.sh supabase functions serve &
           wait-on: |
-            http-get://127.0.0.1:54321/functions/v1/ok
+            http-get://127.0.0.1:${{ env.SUPABASE_API_PORT }}/functions/v1/ok
           # IMPORTANT: to use environment variables in wait-on, you must use this form: ${{ env.VAR }}
           # See wait-on section below for all resource types and prefixes
 

README.md

@@ -321,6 +321,14 @@ This repository uses `./scripts/with-worktree-supabase-env.sh bunx supabase ...`
 for Supabase commands so each git worktree gets isolated Docker project and
 port assignments.
 
+You can use the shorthand `bun run supabase:local -- <supabase-command>` for the
+same behavior. Examples:
+
+```bash
+bun run supabase:local -- start
+bun run supabase:local -- db reset
+```
+
 #### Start Supabase DB Locally
 
 Start the Supabase DB:

package.json

@@ -114,11 +114,11 @@
     "deploy:cloudflare_env:plugin_me:prod": "bunx wrangler secret bulk internal/cloudflare/.env.prod --config cloudflare_workers/plugin/wrangler.jsonc --env=prod_me",
     "deploy:cloudflare_env:plugin_hk:prod": "bunx wrangler secret bulk internal/cloudflare/.env.prod --config cloudflare_workers/plugin/wrangler.jsonc --env=prod_hk",
     "deploy:cloudflare_env:plugin_jp:prod": "bunx wrangler secret bulk internal/cloudflare/.env.prod --config cloudflare_workers/plugin/wrangler.jsonc --env=prod_jp",
-    "deploy:supabase:prod": "./scripts/with-worktree-supabase-env.sh bunx supabase functions deploy --project-ref xvwzpoazmxkqosrdewyv",
-    "deploy:supabase:preprod": "./scripts/with-worktree-supabase-env.sh bunx supabase functions deploy --project-ref aucsybvnhavogdmzwtcw",
-    "deploy:supabase_env:prod": "./scripts/with-worktree-supabase-env.sh bunx supabase secrets set --project-ref xvwzpoazmxkqosrdewyv --env-file internal/cloudflare/.env.prod",
-    "deploy:supabase_env:preprod": "./scripts/with-worktree-supabase-env.sh bunx supabase secrets set --project-ref aucsybvnhavogdmzwtcw --env-file internal/cloudflare/.env.preprod",
-    "deploy:supabase_env:dev": "./scripts/with-worktree-supabase-env.sh bunx supabase secrets set --project-ref aucsybvnhavogdmzwtcw --env-file internal/cloudflare/.env.alpha",
+    "deploy:supabase:prod": "bunx supabase functions deploy --project-ref xvwzpoazmxkqosrdewyv",
+    "deploy:supabase:preprod": "bunx supabase functions deploy --project-ref aucsybvnhavogdmzwtcw",
+    "deploy:supabase_env:prod": "bunx supabase secrets set --project-ref xvwzpoazmxkqosrdewyv --env-file internal/cloudflare/.env.prod",
+    "deploy:supabase_env:preprod": "bunx supabase secrets set --project-ref aucsybvnhavogdmzwtcw --env-file internal/cloudflare/.env.preprod",
+    "deploy:supabase_env:dev": "bunx supabase secrets set --project-ref aucsybvnhavogdmzwtcw --env-file internal/cloudflare/.env.alpha",
     "size": "bunx vite-bundle-visualizer",
     "sentry:sourcemaps": "_SENTRY_RELEASE=$(sentry-cli releases propose-version) && sentry-cli releases new $_SENTRY_RELEASE --org=forgr-cu --project=capgo-cloudflare && sentry-cli sourcemaps upload --org=forgr-cu --project=capgo-cloudflare --release=$_SENTRY_RELEASE --strip-prefix 'cloudflare_workers/api/dist/..' cloudflare_workers/api/dist",
     "postdeploy:cloudflare:api:prod": "bun run sentry:sourcemaps"

scripts/start-cloudflare-workers.sh

@@ -15,7 +15,7 @@ GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 NC='\033[0m' # No Color
 
-SUPABASE_CLI="${ROOT_DIR}/scripts/with-worktree-supabase-env.sh bunx supabase"
+SUPABASE_CLI=("${ROOT_DIR}/scripts/with-worktree-supabase-env.sh" bunx supabase)
 
 # Extract a single variable from `supabase status -o env`, preserving any '=' in values (JWT padding).
 get_supabase_status_var() {
@@ -38,7 +38,7 @@ else
   echo -e "${YELLOW}Warning: ${BASE_ENV_FILE} not found - starting with empty base env${NC}"
 fi
 
-SUPA_ENV="$(${SUPABASE_CLI} status -o env 2>/dev/null || true)"
+SUPA_ENV="$("${SUPABASE_CLI[@]}" status -o env 2>/dev/null || true)"
 SUPABASE_URL_FROM_STATUS="$(get_supabase_status_var 'API_URL')"
 # Supabase CLI has historically emitted either SERVICE_ROLE_KEY/ANON_KEY or SECRET_KEY/PUBLISHABLE_KEY.
 SUPABASE_SERVICE_ROLE_KEY_FROM_STATUS="$(get_supabase_status_var 'SERVICE_ROLE_KEY|SECRET_KEY')"

scripts/with-worktree-supabase-env.sh

@@ -2,19 +2,29 @@
 
 set -euo pipefail
 
+for cmd in cksum awk tr sed cut; do
+  if ! command -v "${cmd}" >/dev/null 2>&1; then
+    echo "Missing required command: ${cmd}" >&2
+    exit 1
+  fi
+done
+
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 WORKTREE_NAME="$(basename "${ROOT_DIR}")"
 
+WORKTREE_HASH_DEC="$(printf '%s' "${ROOT_DIR}" | cksum | awk '{ print $1 }')"
+WORKTREE_HASH_HEX="$(printf '%x' "${WORKTREE_HASH_DEC}")"
+WORKTREE_HASH_SHORT="$(printf '%s' "${WORKTREE_HASH_HEX}" | cut -c1-6)"
+
 SLUG="$(printf '%s' "${WORKTREE_NAME}" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed -E 's/^-+//; s/-+$//')"
 if [ -z "${SLUG}" ]; then
-  SLUG="worktree"
+  SLUG="worktree-${WORKTREE_HASH_SHORT}"
 fi
 
-WORKTREE_HASH_DEC="$(printf '%s' "${ROOT_DIR}" | cksum | awk '{ print $1 }')"
-WORKTREE_HASH_HEX="$(printf '%x' "${WORKTREE_HASH_DEC}")"
-WORKTREE_HASH_SHORT="$(printf '%s' "${WORKTREE_HASH_HEX}" | cut -c1-6)"
 SLUG_SHORT="$(printf '%s' "${SLUG}" | cut -c1-20)"
 
+# Reserve a 20-port block per worktree to keep room for additional local services
+# without renumbering existing allocations.
 SLOT=$((WORKTREE_HASH_DEC % 600))
 BASE_PORT=$((42000 + SLOT * 20))