chore: retire staging branch, document develop → master flow#3208
Merged
Conversation
The `staging` branch has been vestigial for some time: `auto-sync-master-with-develop.yml` already promotes develop to master on every `[RELEASE]`-tagged commit, so the develop → staging → master hop only added merge artifacts (see recent history: a725b00, cff4de8, 81bac41, c46c77a — all post-merge cleanups). The latest production incident (cloud.tangle.tools forwardRef crash) was triggered by exactly this kind of staging-merge rebuild surfacing a latent chunk-cycle bug. Changes: - `.github/workflows/{check-lint,test,check-build,codeql-analysis}.yml`: drop `staging` from the branch trigger lists. - `apps/{tangle-cloud,tangle-dapp,leaderboard}/netlify.toml`: update comments to reflect the new flow and the develop-as-staging deploy environment. The build ignore rule is unchanged — non-master branches already build, so develop branch deploys have always worked. - `CLAUDE.md`: rewrite the Branch Strategy section to document the two-branch model, the `[RELEASE]` auto-sync convention, and the staging-deploy URL pattern. Out-of-band follow-up (will happen as separate ops PRs / API calls): - Delete the `staging` branch on origin once this lands. - Drop `staging` from GitHub branch protection rules. - (Optional) Add Netlify domain aliases for staging.*.tangle.tools so the staging URLs are stable across deploys.
✅ Deploy Preview for tangle-cloud ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
✅ Deploy Preview for tangle-dapp ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
✅ Deploy Preview for tangle-leaderboard ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
drewstone
added a commit
that referenced
this pull request
May 14, 2026
… to master Promotes: - #3204 fix(vite): merge @radix-ui into react chunk to break load-order cycle - #3206 feat(tangle-cloud): wire dispute-bond claim flow (v0.15.0) - #3208 chore: retire `staging` branch, document develop → master flow This is the first non-cascade release after retiring the staging branch. From this point forward, every `[RELEASE]`-tagged commit on develop auto-promotes to master via auto-sync-master-with-develop.yml.
drewstone
added a commit
that referenced
this pull request
May 14, 2026
Folds in develop's three post-cascade commits: - e404bb7 [RELEASE] Promote two-branch model retirement + dispute-bond claim UI to master - 2c93884 Merge pull request #3208 from tangle-network/chore/retire-staging-branch - ed99353 chore: retire `staging` branch, document develop → master flow After this commit, master == develop, so the auto-sync-master-with-develop workflow can fast-forward future `[RELEASE]`-tagged develop tips onto master without divergence.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The `staging` branch has been vestigial for some time: `auto-sync-master-with-develop.yml` already promotes develop to master on every `[RELEASE]`-tagged commit, so the develop → staging → master hop only added merge artifacts. Recent history is full of post-merge cleanups attributable to staging drift:
The latest production incident (`cloud.tangle.tools` forwardRef crash, #3204) was triggered by exactly this kind of staging-merge rebuild surfacing a latent chunk-cycle bug — the ABI sync rebuild on master shuffled Rollup chunks differently than the staging rebuild had, exposing the cycle for the first time.
Changes
Out-of-band follow-up (separate ops PRs / API calls)