Skip to content

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

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

supabase-cli-releaser[bot] merged 2 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 (ff0cd0c); next is at b8d414e.

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.

This bumps studio from 2026.10.12-sha-3699278-r0 to
2026.10.19-sha-b375769-r0.


https://github.com/supabase/slim-services/releases/tag/studio-2026.10.19-sha-b375769-r0

Planned after supabase/slim-services published
2026.10.19-sha-b375769-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 19, 2026
@supabase-cli-releaser
supabase-cli-releaser Bot requested review from a team and supabase-oss as code owners October 19, 2026 05:01
# 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 apps/cli-go, and this Dockerfile now lives at apps/cli/src/shared/services/Dockerfile. The new copy already matches develop's version line for line, including the latest studio and realtime bumps, so I deleted the old path.

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 reported no findings. Code inspection confirms the sync resolution deletes the obsolete Go Dockerfile while preserving the Studio update in the surviving TypeScript Dockerfile and artifact catalog. No issues introduced by the sync resolution were 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-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/39202853151).

@supabase-cli-releaser
supabase-cli-releaser Bot merged commit d70151e into next Oct 19, 2026
49 of 50 checks passed
@supabase-cli-releaser
supabase-cli-releaser Bot deleted the sync/develop-into-next branch October 19, 2026 05:07
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