Skip to content

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

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

supabase-cli-releaser[bot] merged 3 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 (5617afc); next is at 9300081.

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 2 commits October 20, 2026 01:23
This bumps edge-runtime from v1.77.4-r0 to v1.77.5-r0.


https://github.com/supabase/slim-services/releases/tag/edge-runtime-v1.77.5-r0

Planned after supabase/slim-services published v1.77.5-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 realtime from v2.145.4-r0 to v2.145.5-r0.


https://github.com/supabase/slim-services/releases/tag/realtime-v2.145.5-r0

Planned after supabase/slim-services published v2.145.5-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>
@supabase-cli-releaser supabase-cli-releaser Bot added the do not merge Approve to apply; do not merge. label Oct 20, 2026
@supabase-cli-releaser
supabase-cli-releaser Bot requested review from a team and supabase-oss as code owners October 20, 2026 01:51
# 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 tree (ADR 0031), so the Go Dockerfile copy is deleted. develop's image bumps (realtime v2.145.5, edge-runtime v1.77.5, and the others) are already in the canonical apps/cli/src/shared/services/Dockerfile, which matches the deleted copy byte for byte.

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.

🤖 AI Review

Both independent reviews completed with no findings. Inspection of the sync resolution and surrounding code found no merge-introduced issues: the obsolete Go Dockerfile remains deleted, active consumers use the TypeScript Dockerfile, and its service versions match the 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/39356258688).

@supabase-cli-releaser
supabase-cli-releaser Bot merged commit 15d1db7 into next Oct 20, 2026
49 of 50 checks passed
@supabase-cli-releaser
supabase-cli-releaser Bot deleted the sync/develop-into-next branch October 20, 2026 01:58
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.

1 participant