Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
1813aa0
chore(stack): bump realtime to v2.154.1-r0 (#7543)
supabase-cli-releaser[bot] Nov 9, 2026
387f87f
chore(stack): bump storage to v1.90.2-r0 (#7544)
supabase-cli-releaser[bot] Nov 9, 2026
d446013
chore(api): sync Management API OpenAPI spec (#7541)
supabase-cli-releaser[bot] Nov 9, 2026
21c6f68
chore(stack): bump realtime to v2.155.0-r0 (#7547)
supabase-cli-releaser[bot] Nov 9, 2026
4df3c8a
chore(stack): bump realtime to v2.156.0-r0 (#7548)
supabase-cli-releaser[bot] Nov 10, 2026
999550e
chore(api): sync Management API OpenAPI spec (#7552)
supabase-cli-releaser[bot] Nov 10, 2026
529024b
chore(stack): bump storage to v1.91.0-r0 (#7554)
supabase-cli-releaser[bot] Nov 10, 2026
545a40a
fix(stack): accept storage analytics and vector buckets (CLI-2582) (#…
7ttp Nov 10, 2026
6324f99
chore(stack): bump storage to v1.92.0-r0 (#7556)
supabase-cli-releaser[bot] Nov 10, 2026
1095214
chore(stack): bump storage to v1.92.2-r0 (#7559)
supabase-cli-releaser[bot] Nov 10, 2026
da78f94
chore(stack): bump postgres to 17.11.0.019-r0 (#7560)
supabase-cli-releaser[bot] Nov 10, 2026
b280117
chore(stack): add postgres 17.11.0.019-orioledb-r0 (#7562)
supabase-cli-releaser[bot] Nov 10, 2026
d80e2c6
chore(stack): bump postgres to 15.19.0.019-r0 (#7561)
supabase-cli-releaser[bot] Nov 10, 2026
9b4f071
chore(stack): bump storage to v1.92.3-r0 (#7569)
supabase-cli-releaser[bot] Nov 10, 2026
7f95820
chore(stack): bump realtime to v2.156.1-r0 (#7570)
supabase-cli-releaser[bot] Nov 10, 2026
c75aea2
chore(stack): bump storage to v1.94.0-r0 (#7572)
supabase-cli-releaser[bot] Nov 10, 2026
cda78e2
chore(stack): bump realtime to v2.156.2-r0 (#7573)
supabase-cli-releaser[bot] Nov 11, 2026
e8e440b
feat(cli): handle plan-gate denials centrally (#7441)
pamelachia Nov 11, 2026
45e9052
feat(stack): support `api.tls` in `stack start` (CLI-2584) (#7539)
7ttp Nov 11, 2026
31da91e
feat(cli): add supabase config convert (CLI-2867) (#7517)
Coly010 Nov 11, 2026
8b28d92
chore(api): sync Management API OpenAPI spec (#7578)
supabase-cli-releaser[bot] Nov 11, 2026
16dda0e
fix(stack): connect functions to the database as postgres (CLI-2957) …
7ttp Nov 11, 2026
97f06df
chore(stack): bump realtime to v2.157.0-r0 (#7583)
supabase-cli-releaser[bot] Nov 11, 2026
4231a82
feat(cli): experimental compute - add secrets scope field (#7531)
kallebysantos Nov 11, 2026
80eebc9
chore(stack): bump realtime to v2.158.0-r0 (#7587)
supabase-cli-releaser[bot] Nov 11, 2026
df9a973
chore(stack): bump realtime to v2.158.1-r0 (#7588)
supabase-cli-releaser[bot] Nov 11, 2026
6d1a19d
chore(stack): bump realtime to v2.159.0-r0 (#7589)
supabase-cli-releaser[bot] Nov 12, 2026
7a185df
test(stack): fix 1 flaky test in orchestrator integration (#7591)
avallete Nov 12, 2026
2862992
fix(stack): read a reset before the api.tls probe's request as a clos…
avallete Nov 12, 2026
71b24db
fix(cli): give Logflare and Vector a longer start health budget (#7551)
avallete Nov 12, 2026
90e9fb8
feat(config): add `api.db_pool` for the local PostgREST pool (CLI-297…
7ttp Nov 12, 2026
0c8e9a0
feat(cli): record the config file format in command telemetry (CLI-29…
Coly010 Nov 12, 2026
74a9afc
ci(repo): report a setup-cli npm fallback in Slack instead of failing…
Coly010 Nov 12, 2026
3a7f65a
chore(stack): bump storage to v1.94.2-r0 (#7597)
supabase-cli-releaser[bot] Nov 12, 2026
8ede09e
fix(cli): name the stack opt-in when a stack-only flag is rejected (#…
jgoux Nov 12, 2026
bc3b960
fix(stack): apply roles.sql once and as postgres (CLI-3130) (#7595)
7ttp Nov 12, 2026
85eab76
fix(cli): bump @supabase/typegen to 0.3.3 (#7585)
spydon Nov 12, 2026
93dd0ed
fix(cli): drop Postgres 13 and deprecate Postgres 14 for local databa…
jgoux Nov 12, 2026
004482d
fix(cli): suggest the replacement for removed config keys (#7593)
jgoux Nov 12, 2026
5c800b0
chore(stack): bump realtime to v2.160.0-r0 (#7598)
supabase-cli-releaser[bot] Nov 12, 2026
be470d3
fix(cli): bump @supabase/typegen to 0.3.4 (#7599)
spydon Nov 12, 2026
2aa8516
chore(stack): report the container state when docker start times out …
jgoux Nov 12, 2026
f689c30
test(cli-e2e): add external_email_magic_link_disabled to auth config …
jgoux Nov 12, 2026
d8f66a0
chore(api): sync Management API OpenAPI spec (#7596)
supabase-cli-releaser[bot] Nov 12, 2026
7e6c355
chore(cli): bump effect to 4.1.4 (#7605)
jgoux Nov 13, 2026
1b8a1f8
chore(api): sync Management API OpenAPI spec (#7612)
supabase-cli-releaser[bot] Nov 13, 2026
de74552
chore(stack): bump realtime to v2.161.0-r0 (#7614)
supabase-cli-releaser[bot] Nov 13, 2026
a1c2e02
chore(stack): bump storage to v1.95.0-r0 (#7615)
supabase-cli-releaser[bot] Nov 13, 2026
a4149d2
feat(cli): container cpu and memory limits for local stack services (…
jgoux Nov 13, 2026
5c4661c
fix(cli): stop defaulting to private ap-east-1 region (CLI-3136) (#7609)
7ttp Nov 13, 2026
4677658
chore(docs): remove unused Fumadocs site and stale guide (#7617)
mdonnalley Nov 13, 2026
1f0ef00
feat(cli): add supabase config validate (CLI-2866) (#7553)
Coly010 Nov 13, 2026
336eab6
chore(stack): bump edge-runtime to v1.79.0-r0 (#7619)
supabase-cli-releaser[bot] Nov 13, 2026
9d57051
chore(stack): bump postgres to 15.20.0.000-r0 (#7621)
supabase-cli-releaser[bot] Nov 13, 2026
888c0bd
chore(stack): bump postgres to 17.12.0.000-r0 (#7620)
supabase-cli-releaser[bot] Nov 13, 2026
fc2c645
chore(docs): add local CLI reference preview (#7618)
mdonnalley Nov 13, 2026
dd44f66
chore(stack): bump edge-runtime to v1.79.1-r0 (#7622)
supabase-cli-releaser[bot] Nov 13, 2026
c00bffb
chore(stack): bump realtime to v2.162.0-r0 (#7626)
supabase-cli-releaser[bot] Nov 15, 2026
d9822d0
chore(stack): bump realtime to v2.163.0-r0 (#7628)
supabase-cli-releaser[bot] Nov 15, 2026
5646fc0
chore(stack): bump realtime to v2.163.1-r0 (#7629)
supabase-cli-releaser[bot] Nov 16, 2026
fdf40f9
chore(stack): bump realtime to v2.164.0-r0 (#7630)
supabase-cli-releaser[bot] Nov 16, 2026
3685cfb
chore(stack): bump realtime to v2.165.0-r0 (#7631)
supabase-cli-releaser[bot] Nov 16, 2026
c4b86c7
fix(cli): warn when `gen types` drops a `--schema` (CLI-3142) (#7627)
7ttp Nov 16, 2026
1162d4a
chore(stack): bump pooler to v2.10.1-r0 (#7633)
supabase-cli-releaser[bot] Nov 16, 2026
9f2a321
fix(cli): keep multiline function env working on restarts (CLI-3131) …
7ttp Nov 16, 2026
3e40b4b
chore(api): sync Management API OpenAPI spec (#7636)
supabase-cli-releaser[bot] Nov 16, 2026
a4f54ba
fix(cli): stop repeated keychain password prompts (CLI-3135) (#7610)
7ttp Nov 16, 2026
35edf72
fix(cli): prefill the `bootstrap` directory prompt (CLI-3137) (#7613)
7ttp Nov 16, 2026
168a064
chore(stack): bump studio to 2026.11.16-sha-51bd16d-r0 (#7634)
supabase-cli-releaser[bot] Nov 16, 2026
bd6b742
test(cli): cover multiline function env across restarts (CLI-3131) (#…
7ttp Nov 16, 2026
ee6807b
chore(stack): bump storage to v1.96.0-r0 (#7639)
supabase-cli-releaser[bot] Nov 16, 2026
b868a45
feat(cli): add `stack prune` for orphaned stacks (CLI-2548) (#7624)
7ttp Nov 16, 2026
1b7825e
ci(stack): keep pushed commits on slim bump branches (#7638)
jgoux Nov 16, 2026
0f36916
fix(cli): ensure db dump and push pin CA (#7616)
staaldraad Nov 16, 2026
5a42965
chore(stack): bump realtime to v2.167.0-r0 (#7641)
supabase-cli-releaser[bot] Nov 16, 2026
464a39e
fix(cli): wait for concurrent docker prunes by elapsed time (#7550)
avallete Nov 16, 2026
ed07132
test(repo): fix 3 flaky tests in stack and cli live suites (#7623)
avallete Nov 16, 2026
4e2b1ed
test(stack): add diagnostics to 2 flaky owner and Mail tests (#7611)
avallete Nov 16, 2026
c3c7a58
chore(stack): bump auth to v2.198.0-r0 (#7642)
supabase-cli-releaser[bot] Nov 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 3 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ apps/cli/src/shared/telemetry/__fixtures__/error-tags.txt text eol=lf
# source. The attribute is GitHub-only: git, CI, and local diffs are unaffected.
# Collapsed is not hidden. The lockfile does carry changes worth reading --
# a dependency substitution -- and stays one click away in review.
# Regeneration is owned by the `generate` turbo task, whose `outputs` in
# turbo.json are the source of truth for this list. Only the generated files
# are listed, not their hand-written inputs. apps/docs/content/docs/commands/
# is generated too but gitignored, so it needs no entry.
# Regeneration tasks declare their outputs in turbo.json. Only the generated
# files are listed, not their hand-written inputs.
packages/api/src/generated/* linguist-generated=true
packages/api/scripts/openapi-source.json linguist-generated=true
packages/stack/src/functions/generated/* text eol=lf linguist-generated=true
apps/cli/src/shared/feedback/database.types.ts linguist-generated=true
apps/docs/public/schemas/** linguist-generated=true
apps/cli/schemas/** linguist-generated=true

# Lockfiles. Collapsed rather than hidden -- a dependency change is still one
# click away in review, which is the same treatment GitHub gives package-lock.json.
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ on:
required: false
type: string
default: supabase
outputs:
setup_cli_npm_fallback:
description: "'true' when a setup-cli v3 smoke job installed from the GitHub release because the npm install failed"
value: ${{ jobs.setup-cli-smoke.outputs.npm_fallback }}
secrets:
SENTRY_DSN:
required: false
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,28 @@ jobs:
status: success
version: ${{ needs.plan.outputs.version }}
channel: ${{ needs.plan.outputs.channel }}
setup_cli_npm_fallback: ${{ needs.release.outputs.setup_cli_npm_fallback == 'true' }}
secrets:
SLACK_RELEASE_WEBHOOK: ${{ secrets.SLACK_RELEASE_WEBHOOK }}

# notify-slack posts no success message for beta and next, so a setup-cli npm fallback on those
# channels gets a notice of its own.
notify-slack-npm-fallback:
name: Notify Slack (setup-cli npm fallback)
needs: [plan, release]
if: >-
${{ !cancelled() &&
needs.release.result == 'success' &&
needs.plan.outputs.dry_run != 'true' &&
needs.release.outputs.setup_cli_npm_fallback == 'true' &&
needs.plan.outputs.channel != 'stable' &&
needs.plan.outputs.channel != 'maintenance' }}
uses: ./.github/workflows/slack-notify.yml
with:
package: Supabase CLI
status: setup-cli-npm-fallback
version: ${{ needs.plan.outputs.version }}
channel: ${{ needs.plan.outputs.channel }}
secrets:
SLACK_RELEASE_WEBHOOK: ${{ secrets.SLACK_RELEASE_WEBHOOK }}

Expand Down
65 changes: 58 additions & 7 deletions .github/workflows/setup-cli-smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: setup-cli Smoke Test
# workflow_dispatch when debugging setup-cli regressions. Catches regressions like
# supabase/setup-cli#427, where musl libc + archive layout changes silently broke the action on
# Alpine. v3 installs from npm: each v3 runner first waits until npm serves the version, and the
# job fails if setup-cli fell back to the GitHub release. A separate job forces that fallback.
# job warns if setup-cli fell back to the GitHub release. A separate job forces that fallback.

on:
workflow_call:
Expand All @@ -14,6 +14,10 @@ on:
description: Supabase CLI version to install via setup-cli (must already be published to GitHub Releases and npm)
required: true
type: string
outputs:
npm_fallback:
description: "'true' when any v3 job installed from the GitHub release because the npm install failed"
value: ${{ jobs.summary.outputs.npm_fallback }}
workflow_dispatch:
inputs:
version:
Expand Down Expand Up @@ -89,17 +93,27 @@ jobs:
echo "Version mismatch: expected ${expected}, got ${actual}" >&2
exit 1
fi
- name: Verify setup-cli installed from npm
- name: Warn if setup-cli fell back from npm
id: npm-source
if: matrix.major-version == 'v3'
shell: bash
env:
INSTALL_SOURCE: ${{ steps.setup-cli-v3.outputs.install-source }}
run: |
set -euo pipefail
if [ "${INSTALL_SOURCE}" != "npm" ]; then
echo "::error::setup-cli fell back to ${INSTALL_SOURCE} because installing supabase@${VERSION#v} from npm failed; check the setup-cli step log"
exit 1
echo "::warning::setup-cli fell back to ${INSTALL_SOURCE} because installing supabase@${VERSION#v} from npm failed; check the setup-cli step log"
echo "${INSTALL_SOURCE}" > npm-fallback.txt
echo "fallback=true" >> "$GITHUB_OUTPUT"
fi
- name: Record the npm fallback
if: steps.npm-source.outputs.fallback == 'true'
# Best-effort: a failed upload must not fail the release; the warning above still annotates the run.
continue-on-error: true
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: npm-fallback-v3-${{ matrix.runner }}
path: npm-fallback.txt

# A separate job because GitHub Actions only honours `container:` on Linux runners, and mixing
# container + non-container entries in one matrix is fragile when the value is empty. The
Expand Down Expand Up @@ -172,17 +186,27 @@ jobs:
echo "Version mismatch: expected ${expected}, got ${actual}" >&2
exit 1
fi
- name: Verify setup-cli installed from npm
- name: Warn if setup-cli fell back from npm
id: npm-source
if: matrix.major-version == 'v3'
shell: bash
env:
INSTALL_SOURCE: ${{ steps.setup-cli-v3.outputs.install-source }}
run: |
set -euo pipefail
if [ "${INSTALL_SOURCE}" != "npm" ]; then
echo "::error::setup-cli fell back to ${INSTALL_SOURCE} because installing supabase@${VERSION#v} from npm failed; check the setup-cli step log"
exit 1
echo "::warning::setup-cli fell back to ${INSTALL_SOURCE} because installing supabase@${VERSION#v} from npm failed; check the setup-cli step log"
echo "${INSTALL_SOURCE}" > npm-fallback.txt
echo "fallback=true" >> "$GITHUB_OUTPUT"
fi
- name: Record the npm fallback
if: steps.npm-source.outputs.fallback == 'true'
# Best-effort: a failed upload must not fail the release; the warning above still annotates the run.
continue-on-error: true
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: npm-fallback-v3-alpine
path: npm-fallback.txt

setup-cli-smoke-test-github-release:
name: setup-cli v3 GitHub release fallback (ubuntu-latest)
Expand Down Expand Up @@ -222,3 +246,30 @@ jobs:
echo "::error::setup-cli installed from ${INSTALL_SOURCE} instead of falling back to the GitHub release with npm disabled"
exit 1
fi

summary:
name: setup-cli npm fallback summary
needs: [setup-cli-smoke-test, setup-cli-smoke-test-alpine]
if: ${{ always() }}
runs-on: ubuntu-latest
timeout-minutes: 2
permissions:
actions: read
outputs:
npm_fallback: ${{ steps.fallbacks.outputs.npm_fallback }}
steps:
- id: fallbacks
shell: bash
env:
GH_TOKEN: ${{ github.token }}
REPO: ${{ github.repository }}
RUN_ID: ${{ github.run_id }}
run: |
set -euo pipefail
# Never exits nonzero: failing here would fail the release.
if ! names="$(gh api --paginate "repos/${REPO}/actions/runs/${RUN_ID}/artifacts" --jq '.artifacts[].name')"; then
echo "::warning::Could not list this run's artifacts, so the setup-cli npm fallback check did not run; check the setup-cli v3 smoke jobs for a fallback warning"
exit 0
fi
count="$(grep -c '^npm-fallback-' <<< "${names}" || true)"
echo "npm_fallback=$([ "${count}" -gt 0 ] && echo true || echo false)" >> "$GITHUB_OUTPUT"
16 changes: 15 additions & 1 deletion .github/workflows/slack-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
type: string
default: ""
status:
description: Notification kind (success | failure | publish-failure | awaiting-approval | declined | sync-conflict)
description: Notification kind (success | failure | publish-failure | setup-cli-npm-fallback | awaiting-approval | declined | sync-conflict)
required: false
type: string
default: success
Expand All @@ -37,6 +37,11 @@ on:
required: false
type: string
default: ""
setup_cli_npm_fallback:
description: Whether the setup-cli smoke test fell back from npm to the GitHub release. Adds a notice to success messages.
required: false
type: boolean
default: false
secrets:
SLACK_RELEASE_WEBHOOK:
required: true
Expand All @@ -58,6 +63,7 @@ jobs:
TAG_PREFIX: ${{ inputs.tag_prefix }}
NPM_PACKAGE: ${{ inputs.npm_package }}
PULL_REQUEST: ${{ inputs.pull_request }}
SETUP_CLI_NPM_FALLBACK: ${{ inputs.setup_cli_npm_fallback }}
REPO: ${{ github.repository }}
RUN_ID: ${{ github.run_id }}
SHA: ${{ github.sha }}
Expand Down Expand Up @@ -86,6 +92,9 @@ jobs:
if [[ -n "$NPM_PACKAGE" ]]; then
DETAILS="*npm:* <https://www.npmjs.com/package/${NPM_PACKAGE}/v/${VERSION}|${NPM_PACKAGE}@${VERSION}>\n${DETAILS}"
fi
if [[ "$SETUP_CLI_NPM_FALLBACK" == "true" ]]; then
DETAILS="⚠️ *setup-cli smoke test:* installing from npm failed and setup-cli fell back to the GitHub release. See the setup-cli smoke jobs in the workflow run.\n${DETAILS}"
fi
;;
failure)
# version/channel may be empty when the planning job itself failed, so
Expand All @@ -110,6 +119,11 @@ jobs:
FALLBACK_TEXT="⚠️ ${PACKAGE} v${VERSION} was released, but publishing to supabase.com failed"
DETAILS="The CLI reference or config schemas pull request in supabase/supabase was not opened or updated. Rerun the *Publish to supabase.com* job.\n*Version:* v${VERSION}\n*Commit:* <${COMMIT_URL}|${SHORT_SHA}>\n*Workflow run:* <${RUN_URL}|view failed run>"
;;
setup-cli-npm-fallback)
HEADER="⚠️ ${PACKAGE} v${VERSION} released, but setup-cli fell back from npm"
FALLBACK_TEXT="⚠️ ${PACKAGE} v${VERSION} was released, but setup-cli fell back from npm to the GitHub release"
DETAILS="Installing from npm failed in the setup-cli smoke test and setup-cli fell back to the GitHub release. See the setup-cli smoke jobs in the workflow run.\n*Version:* v${VERSION}\n*Commit:* <${COMMIT_URL}|${SHORT_SHA}>\n*Workflow run:* <${RUN_URL}|view run>"
;;
awaiting-approval)
# The approval itself happens on the workflow run page (Approve button +
# the plan job's evidence summary) — an incoming webhook is one-way and
Expand Down
43 changes: 37 additions & 6 deletions .github/workflows/slim-release-published.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ jobs:
exit 1
fi

manual_steps="run manually: ${manual_prefix} ${release}, regenerate the Dockerfile with \`bun apps/cli/scripts/render-service-dockerfile.ts\`, then open a pull request by hand."

git checkout -B "$branch" "$BASE_SHA"

env -u APP_TOKEN bun .github/scripts/sync-artifacts-catalog.ts --service "$SERVICE" --release "$release"
Expand All @@ -160,13 +162,45 @@ jobs:
git add -- "${generated_files[@]}"
git commit -m "$title"

if ! push_output="$(git push --force "$push_url" "HEAD:refs/heads/${branch}" 2>&1)"; then
# `--head` matches by branch name only and ignores the owner, so a fork PR with the
# same head branch name would otherwise match too; `isCrossRepository` excludes it.
existing="$(GH_TOKEN="$APP_TOKEN" gh pr list --head "$branch" --base "$DEFAULT_BRANCH" --state open --json number,isCrossRepository --jq 'map(select(.isCrossRepository | not)) | .[0].number // empty')"

# Commits someone else pushed to the open PR are replayed onto the fresh bump with git
# alone, so no code from the branch runs while the app token is in this shell.
if ! remote_sha="$(git ls-remote "$push_url" "refs/heads/${branch}" | awk -v ref="refs/heads/${branch}" '$2 == ref { print $1 }')"; then
echo "::error ::Failed to read ${branch}; ${manual_steps}"
exit 1
fi
if [ -n "$existing" ] && [ -n "$remote_sha" ]; then
if ! replay="$(GH_TOKEN="$APP_TOKEN" gh api "repos/${GITHUB_REPOSITORY}/compare/${BASE_SHA}...${remote_sha}" \
--jq '"\(.ahead_by) " + ([.commits[] | select((.parents | length) == 1 and .commit.author.email != "41898282+github-actions[bot]@users.noreply.github.com") | .sha] | join(" "))')"; then
echo "::error ::Failed to list the commits on ${branch}; ${manual_steps}"
exit 1
fi
read -r ahead_by others <<<"$replay"
if [ -n "${others:-}" ]; then
read -r -a others <<<"$others"
echo "${branch} has ${#others[@]} commit(s) from others; replaying them onto ${release}."
if ! git fetch --no-tags --depth="$((ahead_by + 1))" "$push_url" "$remote_sha" ||
! git -c core.hooksPath=/dev/null cherry-pick --keep-redundant-commits "${others[@]}"; then
git cherry-pick --abort 2>/dev/null || true
echo "::error ::Could not replay the commits others pushed to ${branch} onto ${release}. Rebuild ${branch} from ${DEFAULT_BRANCH} with ${manual_prefix} ${release}, regenerate the Dockerfile with \`bun apps/cli/scripts/render-service-dockerfile.ts\`, then cherry-pick those commits by hand."
exit 1
fi
fi
fi

if ! push_output="$(git push "--force-with-lease=refs/heads/${branch}:${remote_sha}" "$push_url" "HEAD:refs/heads/${branch}" 2>&1)"; then
echo "$push_output"
if grep -q "(stale info)" <<<"$push_output"; then
echo "::error ::${branch} changed while this run was updating it. Re-run this job to replay the new commits onto ${release}."
exit 1
fi
if ! grep -q "queued for merging cannot be updated" <<<"$push_output"; then
echo "::error ::Failed to push ${branch}. Run manually: ${manual_prefix} ${release}, regenerate the Dockerfile with \`bun apps/cli/scripts/render-service-dockerfile.ts\`, then open a pull request by hand."
exit 1
fi
manual_steps="run manually: ${manual_prefix} ${release}, regenerate the Dockerfile with \`bun apps/cli/scripts/render-service-dockerfile.ts\`, then open a pull request by hand."
queued_steps="Once ${branch} leaves the merge queue, ${manual_steps}"
# The app token minted just before this step expires after one hour; capping the wait at
# 50 minutes into the step leaves room for the lookups and the dispatch that follow it.
Expand Down Expand Up @@ -222,12 +256,9 @@ jobs:
fi
# Names the release this PR actually pins, not necessarily RELEASE_VERSION: postgres
# can plan a hotfix on one line and an unrelated upgrade on another in one dispatch.
body="$(printf 'This %s.\n\nhttps://github.com/supabase/slim-services/releases/tag/%s-%s\n\nPlanned after supabase/slim-services published %s. This branch is rewritten from %s whenever a newer relevant release arrives.\n' \
body="$(printf 'This %s.\n\nhttps://github.com/supabase/slim-services/releases/tag/%s-%s\n\nPlanned after supabase/slim-services published %s. A newer relevant release rewrites this branch from %s and replays any commits others pushed to it.\n' \
"$change" "$SERVICE" "$release" "$RELEASE_VERSION" "$DEFAULT_BRANCH")"

# `--head` matches by branch name only and ignores the owner, so a fork PR with the
# same head branch name would otherwise match too; `isCrossRepository` excludes it.
existing="$(GH_TOKEN="$APP_TOKEN" gh pr list --head "$branch" --base "$DEFAULT_BRANCH" --state open --json number,isCrossRepository --jq 'map(select(.isCrossRepository | not)) | .[0].number // empty')"
if [ -n "$existing" ]; then
if ! GH_TOKEN="$APP_TOKEN" gh pr edit "$existing" --title "$title" --body "$body"; then
echo "::error ::Pushed ${branch} but failed to edit pull request #${existing}. Run manually: ${manual_prefix} ${release}, then edit the pull request from ${branch} by hand."
Expand Down
3 changes: 1 addition & 2 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"apps/cli/src/shared/feedback/database.types.ts",
"packages/stack/src/functions/generated/",
"apps/cli-e2e/fixtures/",
"apps/docs/content/docs/commands/",
"apps/docs/public/",
"apps/cli/schemas/",
"**/testdata/"
]
}
5 changes: 2 additions & 3 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ Bun monorepo with workspaces under `apps/` and `packages/`. `pnpm` is the packag
## Workspaces and naming

- `apps/cli` — published `supabase` CLI
- `apps/docs` — Next.js docs site
- `packages/api` — typed Management API client
- `packages/config` — published config schema and generated types
- `packages/stack` — local Supabase stack runtime
- `packages/cli-*` — published platform binary wrappers

Use an existing TypeScript/Bun workspace, especially `packages/api`, as the package-structure
reference. Published `apps/cli` and `packages/config` are not private; `apps/docs` and
`packages/cli-*` have their own shapes. Lint, format, and unused-code tooling is
reference. Published `apps/cli` and `packages/config` are not private;
`packages/cli-*` has its own shape. Lint, format, and unused-code tooling is
root-owned.

### Config Naming Vocabulary
Expand Down
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ That pulls `.repos/effect/`, which is the local source of truth for Effect v4 AP
```text
.
|-- apps/
| |-- cli/ # Published Supabase CLI package
| `-- docs/ # Next.js docs site generated from the CLI
| |-- cli/ # Published Supabase CLI package
| `-- cli-e2e/ # CLI compatibility tests
|-- packages/
| |-- api/ # Typed Supabase Management API client
| |-- config/ # Supabase config schema and generated types
Expand All @@ -107,7 +107,6 @@ That pulls `.repos/effect/`, which is the local source of truth for Effect v4 AP
| -------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
| `apps/cli` | Main `supabase` package. Contains command handlers, runtime services, auth, output, telemetry, and docs generation scripts. |
| `apps/cli-e2e` | Compatibility e2e test suite. Record-and-replay harness for testing the TypeScript CLI against real Supabase Management API responses. |
| `apps/docs` | Internal docs site built with Next.js and generated from the CLI docs sources. |

## Packages

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
"saml_enabled": false,
"saml_external_url": null,
"security_sb_forwarded_for_enabled": false,
"external_email_magic_link_disabled": false,
"security_captcha_enabled": false,
"security_captcha_provider": "hcaptcha",
"security_captcha_secret": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
"saml_enabled": false,
"saml_external_url": null,
"security_sb_forwarded_for_enabled": false,
"external_email_magic_link_disabled": false,
"security_captcha_enabled": false,
"security_captcha_provider": "hcaptcha",
"security_captcha_secret": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
"saml_enabled": false,
"saml_external_url": null,
"security_sb_forwarded_for_enabled": false,
"external_email_magic_link_disabled": false,
"security_captcha_enabled": false,
"security_captcha_provider": "hcaptcha",
"security_captcha_secret": null,
Expand Down
Loading
Loading