supabase / cli / 37787904774
67%
develop: 67%

LAST BUILD BRANCH: slim-bump/studio
DEFAULT BRANCH: develop
Ran
Jobs 1
Files 79
Run time 1min
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
coverage: 66.737%. Remained the same
37787904774

push

github

web-flow 
ci(release): announce back-merge conflicts after a hotfix (#7051)

Linear: [CLI-2442](https://linear.app/supabase/issue/CLI-2442)

Second of three PRs for the hotfix flow on top of #7038. After a hotfix
publishes from `main`, the sync merges `main` back into `develop`. When
that conflicts, the bot opens a sync PR that nobody is told about, and a
Tuesday deploy approved in the meantime is refused with a comment that
only says `main` moved. This PR closes both gaps without changing how
the sync or the fast-forward work.

- **Sync branches** exposes the conflict PR number as a job output. For
the `main-into-develop` pair a new job posts a `sync-conflict` message
to the release Slack channel with the PR link and the resolution steps,
through the shared Slack workflow. The `develop-into-next` pair is
unchanged. CODEOWNERS already requests the CLI team on these PRs, so no
review request is added.
- **Fast-forward on approval**: when a deploy PR is refused because
`main` has commits `develop` lacks, the comment names the open
`sync/main-into-develop` PR, or tells the approver to dispatch the sync
if none is open. A failed lookup falls back to the generic comment
rather than skipping it.
- **Slack notify** gains the `sync-conflict` status and a `pull_request`
input; `version` becomes optional for messages that are not about a
release.

Draft alongside #7050; both are independent of each other.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude <noreply@anthropic.com>

4097 of 6139 relevant lines covered (66.74%)

7.37 hits per line

Jobs
ID Job ID Ran Files Coverage
1 37787904774.1 79
66.74
GitHub Action Run
Source Files on build 37787904774