Skip to content

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

Merged
supabase-cli-releaser[bot] merged 2 commits into
nextfrom
sync/develop-into-next
Oct 16, 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 (8c91ac5); next is at 7eb99c3.

Conflicting files:

  • apps/cli-go/api/v1-openapi.yaml
  • apps/cli-go/pkg/api/client.gen.go
  • apps/cli-go/pkg/api/types.gen.go

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 PR was automatically created to sync API types from the
infrastructure repository.

Changes were detected after refreshing `apps/cli-go/api/v1-openapi.yaml`
from the latest spec from infrastructure, and `apps/cli-go/pkg/api` is
regenerated from it. The snapshot diff is the upstream API change and is
worth reading: it is marked `linguist-generated`, so GitHub collapses it
behind a "Load diff" click rather than hiding it.

Co-authored-by: supabase-cli-releaser[bot] <246109035+supabase-cli-releaser[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 16, 2026
@supabase-cli-releaser
supabase-cli-releaser Bot requested a review from a team as a code owner October 16, 2026 06:10
# Conflicts:
#	apps/cli-go/api/v1-openapi.yaml
#	apps/cli-go/pkg/api/client.gen.go
#	apps/cli-go/pkg/api/types.gen.go
@supabase-cli-releaser

Copy link
Copy Markdown
Contributor Author

Claude resolved the merge of next

next removes the Go CLI completely (ADR 0031). The only conflicts were three generated Go API files that develop refreshed during an API types sync, so I deleted them. The matching TypeScript API type updates from develop merged without conflict, and nothing left in the tree refers to the deleted paths except the ADR itself.

Deleted: apps/cli-go/api/v1-openapi.yaml, apps/cli-go/pkg/api/client.gen.go, apps/cli-go/pkg/api/types.gen.go.

Decisions for @supabase/cli. Confirm them, or push a change to this branch:

  • Should develop's regenerated Go OpenAPI spec and generated Go client/types survive, given next removed apps/cli-go? Chose: Delete them, following next's removal of the Go CLI. develop's change was only an automated API sync, and the TypeScript API types it also updated are kept.

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 zero findings. The supplied PR diff is empty, leaving no changed code or findings to adjudicate. This does not establish that the PR is defect-free.

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/38860131074).

@supabase-cli-releaser
supabase-cli-releaser Bot merged commit b4a24ea into next Oct 16, 2026
44 of 45 checks passed
@supabase-cli-releaser
supabase-cli-releaser Bot deleted the sync/develop-into-next branch October 16, 2026 06:15
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