Repository navigation
Conversation
|
KoolADE85
approved these changes
Nov 3, 2026
| # Something merged into next meanwhile. | ||
| git fetch origin next | ||
| done | ||
| [ -n "$conflict" ] || exit 1 |
Contributor
There was a problem hiding this comment.
I'm not sure why we need to retry three times here?
Even if it's necessary, if the 3rd attempt fails, there is no way to alert ourselves of the failure. It just silently runs exit 1.
| gh workflow run testing.yml --ref "$MERGE_BRANCH" | ||
| else | ||
| # The branch is dev itself, so the checks already run on dev apply. | ||
| git push --force origin "origin/dev:refs/heads/$MERGE_BRANCH" |
Contributor
There was a problem hiding this comment.
An edge case, but this might be safer:
Suggested change
| git push --force origin "origin/dev:refs/heads/$MERGE_BRANCH" | |
| git push --force-with-lease origin "origin/dev:refs/heads/$MERGE_BRANCH" |
Comment on lines
1359
to
1362
| github.event_name == 'push' && | ||
| (github.ref == 'refs/heads/master' || | ||
| github.ref == 'refs/heads/dev' || | ||
| startsWith(github.ref, 'refs/tags/')) |
Contributor
There was a problem hiding this comment.
This is still restricted to master and dev - do we want to store build artifacts for pushes to next as well?
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
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.
Sets up the
next+devworkflow from RFD #142 (Dash release management: a next branch alongside dev). Fixes and chores targetdevand ship as patches; features targetnextand ship as minors.Already done outside this PR:
nextcreated fromdevat 4.5.0 (00b8ed6), with a ruleset requiring a PR, one code-owner review, merge commits only, and the checksConsolidated Test Report,percy/dash-table-test,Forward merge not conflicted. Before merging: add the write deploy key, theDEV_NEXT_MERGE_KEYsecret, and the DeployKey bypass on thenextruleset.Changes
forward-merge.yml: on each push todev, mergesdevintonextand pushes it with theDEV_NEXT_MERGE_KEYdeploy key. The deploy key and admins are the only actors allowed to bypass thenextruleset. If the merge conflicts, it opens a "Merge dev into next" PR fromdev-into-nextinstead, and automatic merges pause until that PR is merged. It posts theForward merge not conflictedstatus on that PR itself, because PRs opened withGITHUB_TOKENdo not trigger workflows.branch-policy.yml:devthat add an UnreleasedAddedCHANGELOG entry.nextwhile the forward PR has conflicts.testing.yml: runs on push tonext;workflow_dispatchnow runs the full suite.CONTRIBUTING.md, the PR template andCLAUDE.mdexplain which branch to target and the release steps;.ai/PERFORMANCE.mdcovers per-branch benchmark baselines.Not verified yet
next/dev-into-nextmay need manual approval.Tested locally: the changelog script on fix, feature, old-style heading and existing-entry cases, and the forward-merge script against a local bare repo for each branch state (already merged, clean automatic merge, push race with another merge into
next, conflict opening a PR, new fixes while that PR is open, resolved branch with a clean or conflicting fix). Not tested in a running Dash app: no Dash runtime behavior changes.