Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/fork-seams.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"//": "Upstream files with fork lines, and every line the fork may add to each (indentation and blank lines ignored). Checked by .github/scripts/fork-seam-check.cjs against the base branch's copy of this file; see docs/fork/updates.md.",
"//": "Upstream files with fork lines, and every line the fork may add to each (indentation and blank lines ignored). Checked by .github/scripts/fork-seam-check.cjs against the base branch's copy of this file; see docs/fork/updates.md. A new line is first announced in its entry (\"announced\": {\"since\": day, \"added\": [lines]}), then added by a later pull request that moves it to \"added\" (docs/fork/updates.md, Adding a seam line).",
"files": {
"packages/contracts/src/settings.ts": {
"why": "Fork settings live in forkSettings.ts; settings.ts takes them with one spread per struct. automaticUpdates stays inline: upstream's pending setting has the same name and place.",
Expand Down Expand Up @@ -211,7 +211,6 @@
"apps/server/src/waits/",
"apps/server/src/workAdmission*",
"apps/web/src/clientPersistenceStorage.removedKeys.test.ts",
"apps/web/src/components/chat/MarkdownFileLink.logic.test.ts",
"apps/web/src/components/settings/WaitsAndSlotsSettings*",
"apps/web/src/components/settings/waitsAndSlotsSettings*",
"packages/contracts/src/editor.test.ts",
Expand All @@ -226,9 +225,10 @@
"packages/shared/src/capacity*",
"packages/shared/src/waitFor*",
"scripts/lib/release-repository.ts",
"scripts/release-repository.test.ts"
"scripts/release-repository.test.ts",
"!scripts/scenarios/fork-title-regenerates-from-inherited-history.e2e.ts"
],
"//lost": "Seam and pending files that lost upstream lines, counted from upstream (as fork-follow runs the check): \"lines\", the upstream lines not kept in order and indentation; \"gone\", those whose text is gone. Held exactly, like a ceiling; an unlisted file counts 0. Lower a count when a line comes back, and keep each one small: a line counted here may move unseen.",
"//lost": "Seam and pending files that lost upstream lines, counted from upstream (as fork-follow runs the check): \"lines\", the upstream lines not kept in order and indentation; \"gone\", those whose text is gone. Held exactly, like a ceiling; an unlisted file counts 0. Lower a count when a line comes back, and keep each one small: a count is not a set of lines, so a line counted here may move unseen, and in a pending file a pull request can put back one gone upstream line and delete another with both counts unchanged.",
"lost": {
"packages/shared/src/serverSettings.ts": {
"lines": 1,
Expand Down
3 changes: 2 additions & 1 deletion .github/scripts/fork-follow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ seam_check() { # seam_check BASE WHAT [--after-rebase]
return 0
fi
if ((status == 1)) && grep -qF "$seam_refusal" "$logs/seam-check.log"; then
fail "$2 does not fit the seam list (.github/fork-seams.json):" '```' "$(cat "$logs/seam-check.log")" '```'
fail "$2 does not fit the seam list (.github/fork-seams.json):" '```' "$(cat "$logs/seam-check.log")" '```' \
"The series was left as it is."
fi
fail "The seam check crashed (exit $status), so it did not say whether the series stays within the seams:" \
'```' "$(tail -n 20 "$logs/seam-check.log")" '```' "The series was left as it is."
Expand Down
1 change: 1 addition & 0 deletions .github/scripts/fork-follow.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ seams "fork seam" "inline fork line"
plan
check "plan: a fork line beyond the seams stops the plan, naming it" \
eval 'has "The series does not fit the seam list" "$root/report.md" && has "inline fork line" "$root/report.md" && [[ -z "$(out action)" ]]'
check "plan: the seam refusal says the series was left as it is" has "The series was left as it is" "$root/report.md"

# Round 5: upstream workflow files the fork deletes (.github/fork-removed-workflows.txt) stay
# deleted on every follow, and a new upstream workflow that someone outside the fork can start
Expand Down
Loading
Loading