Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19ba5f0394 | ||
|
|
439a6cd77b | ||
|
|
a5515d1d9f | ||
|
|
7b90633456 | ||
|
|
7838f45ed4 | ||
|
|
2453d717cf | ||
|
|
49445ded77 | ||
|
|
dfb338fc37 |
@@ -42,11 +42,16 @@ strings and identical specs produce different bytes on different builds.
|
|||||||
playback and then clicks pause races the track ending and fails
|
playback and then clicks pause races the track ending and fails
|
||||||
against a correct UI. Use `LONG_TRACK` (90 s, `edge-lengths`) exported
|
against a correct UI. Use `LONG_TRACK` (90 s, `edge-lengths`) exported
|
||||||
from `e2e/support/fixtures.ts`.
|
from `e2e/support/fixtures.ts`.
|
||||||
- **WAV tracks scan in untitled.** `backend/tagwriter` writes WAV tags
|
- **WAV tracks scan like every other format.** #104 added
|
||||||
into a RIFF `id3 ` chunk and `dhowden/tag` has no RIFF parser, so
|
`backend/riff`, so the scan reads the `id3 ` chunk `backend/tagwriter`
|
||||||
there is no "Field Recordings" artist in the Artists view. This is a
|
writes and both WAVs come in fully tagged: "Field Recordings" is an
|
||||||
known open bug pinned by `TestWAVTagsAreNotReadableYet`; do not
|
ordinary artist in the Artists view, with a "Test Tones" album and a
|
||||||
"fix" a spec by asserting the broken behaviour elsewhere.
|
cover. They are therefore not an example of an untitled or albumless
|
||||||
|
track — the only two tracks with no album are
|
||||||
|
`unsorted/no-tags-at-all.mp3` and `unsorted/title-only.mp3`. Prose
|
||||||
|
written before #104 says the opposite and names
|
||||||
|
`TestWAVTagsAreNotReadableYet`, a test that change deleted; that is
|
||||||
|
dated history rather than a description of the app.
|
||||||
|
|
||||||
## Seeds
|
## Seeds
|
||||||
|
|
||||||
|
|||||||
@@ -163,7 +163,22 @@ Merge when, and only when, **all** hold:
|
|||||||
- the protection contexts `CI / check` and `CI / e2e` are green on the
|
- the protection contexts `CI / check` and `CI / e2e` are green on the
|
||||||
PR's head, read from the API, not from the PR page's badge;
|
PR's head, read from the API, not from the PR page's badge;
|
||||||
- the PR reports mergeable;
|
- the PR reports mergeable;
|
||||||
- the critique leg ran and no open blocker stands.
|
- the critique leg ran and no open blocker stands;
|
||||||
|
- the branch is **not behind `origin/main`** — the protection's
|
||||||
|
`block_on_outdated_branch: true` refuses it anyway; never
|
||||||
|
`force_manually_merged` around it.
|
||||||
|
|
||||||
|
**Refresh before every merge.** In the loop worktree: fetch, then
|
||||||
|
`git merge origin/main` on the PR branch, push. A textual conflict
|
||||||
|
stops the leg there — as diff text, not as a failed merge click: hunks
|
||||||
|
the loop authored are resolved by the loop; anything else is left with
|
||||||
|
`⟦loop⟧` comment for a human, never forced. After any refresh push,
|
||||||
|
re-poll the PR's own required contexts on the **new head** before
|
||||||
|
merging.
|
||||||
|
|
||||||
|
**Merges happen one at a time**, each re-reading state — the previous
|
||||||
|
merge moved `main`, and the next PR's mergeability is recomputed at
|
||||||
|
its own turn.
|
||||||
|
|
||||||
```
|
```
|
||||||
curl -sS -X POST -H "Authorization: token $GITEA_TOKEN" \
|
curl -sS -X POST -H "Authorization: token $GITEA_TOKEN" \
|
||||||
@@ -172,12 +187,20 @@ curl -sS -X POST -H "Authorization: token $GITEA_TOKEN" \
|
|||||||
-d '{"Do":"merge","merge_message_field":"default","force_manually_merged":false}'
|
-d '{"Do":"merge","merge_message_field":"default","force_manually_merged":false}'
|
||||||
```
|
```
|
||||||
|
|
||||||
Afterwards: `scripts/issue.sh list --state open` and check the footer
|
**Afterwards watch the `push` run on `main`** — the CI the merge
|
||||||
took. Close stragglers with `issue.sh close`, naming the merge commit.
|
started. A red main after a loop merge is a **halt**: comment what is
|
||||||
`unclaim.yml` handles the label; it is not instant; reopening does not
|
known on the offending PR, mark the state file, stop taking new issues.
|
||||||
restore it. Merging fans out to nothing (releases are the manual
|
That run is the only thing between a clean textual merge of
|
||||||
`release.yml`, which the loop never runs) — the criticism stands before
|
independently-written PRs and a self-contradicting main; no
|
||||||
the merge because nothing stands after it.
|
mergeability check sees it. Only a green main lets the tick proceed (to
|
||||||
|
footer verification, below).
|
||||||
|
|
||||||
|
Footer verification: `scripts/issue.sh list --state open` and check
|
||||||
|
the footer took. Close stragglers with `issue.sh close`, naming the
|
||||||
|
merge commit. `unclaim.yml` handles the label; it is not instant;
|
||||||
|
reopening does not restore it. Merging fans out to nothing (releases
|
||||||
|
are the manual `release.yml`, which the loop never runs) — the
|
||||||
|
criticism stands before the merge because nothing stands after it.
|
||||||
|
|
||||||
## Rails — the loop's absolute rules
|
## Rails — the loop's absolute rules
|
||||||
|
|
||||||
|
|||||||
@@ -140,6 +140,20 @@ from a concurrent session is caught before the first edit.
|
|||||||
|
|
||||||
- **Only PRs the loop opened.** A collaborator's PR is never merged, never
|
- **Only PRs the loop opened.** A collaborator's PR is never merged, never
|
||||||
commented on for pressure, never touched.
|
commented on for pressure, never touched.
|
||||||
|
- **Every branch is refreshed against main before its merge**, in the
|
||||||
|
loop worktree — the refresh is where a textual conflict surfaces, as
|
||||||
|
diff text: hunks the loop authored are resolved there, anything else
|
||||||
|
is left to a human with a `⟦loop⟧` comment. The protection's
|
||||||
|
`block_on_outdated_branch` makes the refresh mandatory for adopted
|
||||||
|
(pre-loop) branches: behind `main`, a PR cannot merge at all.
|
||||||
|
Required contexts are re-polled on the refreshed head.
|
||||||
|
- **Merges are one at a time**, each re-reading state — the previous
|
||||||
|
merge moved `main`, and the next PR's mergeability is recomputed at
|
||||||
|
its own turn.
|
||||||
|
- **Post-merge, the `push` run on `main` is watched.** A red main after
|
||||||
|
a loop merge halts the loop. That run is the only guard against the
|
||||||
|
class no mergeability check sees: two PRs touching the same file,
|
||||||
|
merging cleanly, contradicting each other.
|
||||||
- The gate is the protection rule itself, read from the API: contexts
|
- The gate is the protection rule itself, read from the API: contexts
|
||||||
`CI / check*` and `CI / e2e*` green, PR mergeable. (Required approvals
|
`CI / check*` and `CI / e2e*` green, PR mergeable. (Required approvals
|
||||||
is 0 today; if a second person changes protection rules, the merge
|
is 0 today; if a second person changes protection rules, the merge
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
|
"syscall"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -17,6 +18,21 @@ import (
|
|||||||
|
|
||||||
// stubYtDlp writes an executable script that echoes the given stdout
|
// stubYtDlp writes an executable script that echoes the given stdout
|
||||||
// and returns it as a provider config binary path.
|
// and returns it as a provider config binary path.
|
||||||
|
//
|
||||||
|
// The write is held under syscall.ForkLock, and that is not tidiness:
|
||||||
|
// the kernel refuses to exec a file that is open for writing anywhere
|
||||||
|
// in the process, and these tests are parallel, so a *sibling* test's
|
||||||
|
// fork can duplicate this descriptor in the moment it is open and
|
||||||
|
// carry it past our close — the exec a moment later then fails with
|
||||||
|
// ETXTBSY, "text file busy". That is #146, seen once in CI and once
|
||||||
|
// locally, on trees containing no Go at all. Closing sooner is not
|
||||||
|
// available (os.WriteFile has already closed the file before anything
|
||||||
|
// execs it) and O_CLOEXEC does not help, because the window is between
|
||||||
|
// another goroutine's fork and its own exec. ForkLock is the lock
|
||||||
|
// syscall.forkExec takes across that fork, so holding it here means no
|
||||||
|
// child can exist while the descriptor does. Measured on this helper
|
||||||
|
// under 12 concurrent writers: 176-189 of 2400 execs refused without
|
||||||
|
// it, 0 of 2400 with it.
|
||||||
func stubYtDlp(t *testing.T, script string) string {
|
func stubYtDlp(t *testing.T, script string) string {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
@@ -26,9 +42,11 @@ func stubYtDlp(t *testing.T, script string) string {
|
|||||||
|
|
||||||
path := filepath.Join(t.TempDir(), "yt-dlp")
|
path := filepath.Join(t.TempDir(), "yt-dlp")
|
||||||
|
|
||||||
if err := os.WriteFile(
|
syscall.ForkLock.Lock()
|
||||||
path, []byte("#!/bin/sh\n"+script), 0o700,
|
err := os.WriteFile(path, []byte("#!/bin/sh\n"+script), 0o700)
|
||||||
); err != nil {
|
syscall.ForkLock.Unlock()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
t.Fatalf("write stub: %v", err)
|
t.Fatalf("write stub: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user