Skip to content

chore(repo): sync develop into next - #7245

Merged
supabase-cli-releaser[bot] merged 6 commits into
nextfrom
sync/develop-into-next
Oct 19, 2026
Merged

supabase-cli-releaser[bot] merged 6 commits into
nextfrom
sync/develop-into-next

Conversation

@supabase-cli-releaser

Copy link
Copy Markdown
Contributor

Merging develop into next conflicts. This branch starts at the tip of develop (600ca9a); next is at 76fc6bb.

Conflicting files:

  • apps/cli-go/pkg/config/templates/Dockerfile

To resolve:

git fetch origin
git switch sync/develop-into-next
git merge origin/next
# resolve the conflicts, then commit
git push origin sync/develop-into-next

Approve to fast-forward next; do not use the merge button.

supabase-cli-releaser Bot and others added 4 commits October 19, 2026 16:28
This adds postgres 17.11.0.006-orioledb-r0 as a new release line.


https://github.com/supabase/slim-services/releases/tag/postgres-17.11.0.006-orioledb-r0

Planned after supabase/slim-services published 15.19.0.006-r0. This
branch is rewritten from develop whenever a newer relevant release
arrives.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This bumps postgres from 15.19.0.005-r0 to 15.19.0.006-r0.


https://github.com/supabase/slim-services/releases/tag/postgres-15.19.0.006-r0

Planned after supabase/slim-services published 15.19.0.006-r0. This
branch is rewritten from develop whenever a newer relevant release
arrives.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This bumps postgres from 17.11.0.005-r0 to 17.11.0.006-r0.


https://github.com/supabase/slim-services/releases/tag/postgres-17.11.0.006-r0

Planned after supabase/slim-services published 15.19.0.006-r0. This
branch is rewritten from develop whenever a newer relevant release
arrives.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…2749) (#7216)

## TL;DR

stack `rest` now comes up even when a `db_pre_request` hook rejects
requests without an app header.

## whats missing?

the stack never started PostgREST's admin server, so it checked
readiness with a plain `GET /`.
that request goes through the project's `db_pre_request` hook, which
answers 403 to anything without the header, so rest never looked ready.

eager start timed out, and lazy start gave the first API request a 502
after a min

## now fixed by:

rest now runs the admin server and checks its `/ready`
same as legacy start, so the hook never sees the probe. recipes pick the
probed port with a new optional `healthPort`, which defaults to `http`

<details>
<summary>visual rep:</summary>

```mermaid
flowchart TB
  subgraph before
    direction LR
    A1["readiness probe"] -->|"GET /"| B1["data port"]
    B1 --> C1["db_pre_request hook"]
    C1 -->|"403"| D1["never ready (eager timeout, lazy 502)"]
  end
  subgraph after
    direction LR
    A2["readiness probe"] -->|"GET /ready"| B2["admin server"]
    B2 -->|"200 once the schema cache loads"| D2["ready"]
  end
  before ~~~ after
```

</details>

## ref:

- closes: #7215
@supabase-cli-releaser supabase-cli-releaser Bot added the do not merge Approve to apply; do not merge. label Oct 19, 2026
@supabase-cli-releaser
supabase-cli-releaser Bot requested a review from a team as a code owner October 19, 2026 19:23
# Conflicts:
#	apps/cli-go/pkg/config/templates/Dockerfile
@supabase-cli-releaser

Copy link
Copy Markdown
Contributor Author

Claude resolved the merge of next

next removed the Go CLI (apps/cli-go), including this Dockerfile. develop had only bumped image tags in it. Those same bumps already appear in the canonical apps/cli/src/shared/services/Dockerfile, which is byte-identical to develop's Go copy, so I deleted the file.

Deleted: apps/cli-go/pkg/config/templates/Dockerfile.

Quick checks. The merged tree passes check:all and unit tests.

Approve to fast-forward next once checks pass (workflow run).

@github-actions github-actions Bot left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Superseded by a newer AI review

🤖 AI Review

Both independent reviews completed with no findings. Verification of the sync resolution confirms that the deleted Go Dockerfile is byte-identical to the retained TypeScript Dockerfile, whose PostgreSQL tags match the artifact catalog. The generator targets the retained file, and no executable references to the deleted path were found. No merge-introduced issues identified.

Findings

No issues found.

Stats

Claude findings: 0 · Codex findings: 0 · Confirmed: 0 · Refuted: 0 · Uncertain: 0


Models: claude-opus-5-5 + gpt-6.1-sol · Trigger: manual · Workflow run

This review runs once per PR. A maintainer can request another with a /ai-review comment.

@supabase-cli-releaser

Copy link
Copy Markdown
Contributor Author

Claude repair round

The integration tests failed because develop moved the default postgres image up to 17.11.0.006, but six local-container-inputs golden snapshots still expected 17.11.0.005. I changed all six goldens to 17.11.0.006 to keep develop's bump; no other failures needed changes, and there were no open review findings.

0 findings fixed, 0 declined (workflow run).

@supabase-cli-releaser

Copy link
Copy Markdown
Contributor Author

The repair commit moved the head to 81b375b, so the AI review runs once more; later rounds only answer its findings.

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Review

Both independent reviews completed with zero findings. My inspection found no additional sync-specific issues: the obsolete Go Dockerfile remains deleted, its retained TypeScript counterpart preserves the image definitions, and all six fixture updates match PostgreSQL 17.11.0.006 in the Dockerfile and artifact catalog.

Findings

No issues found.

Stats

Claude findings: 0 · Codex findings: 0 · Confirmed: 0 · Refuted: 0 · Uncertain: 0


Models: claude-opus-5-5 + gpt-6.1-sol · Trigger: manual · Workflow run

This review runs once per PR. A maintainer can request another with a /ai-review comment.

@supabase-oss supabase-oss left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is green and the AI review raised nothing the merge introduced, so this approves Claude's resolution of the sync (https://github.com/supabase/cli/actions/runs/39316086839).

@supabase-cli-releaser
supabase-cli-releaser Bot merged commit 81b375b into next Oct 19, 2026
48 of 49 checks passed
@supabase-cli-releaser
supabase-cli-releaser Bot deleted the sync/develop-into-next branch October 19, 2026 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not merge Approve to apply; do not merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants