Merges main into next with a real merge commit, so main is an ancestor of next and the milestone PR #380 merges again. Implements #497.
#416 brought to main a copy of fixes next already had in its own form. Only script/test conflicted. It keeps next's version, which already does everything main's does: no -v, the -p 4 -parallel 8 memory cap, plus coverage and a -v rerun of failed tests. The other four files main changed (internal/database/password.go, internal/database/password_test.go, internal/database/export_test.go, internal/resetpw/resetpw_test.go) merged on their own, because main's lines in them are the same as next's. That leaves one test-hashing cost and one script/test.
What the diff does not show: the merged tree is identical to next's, so the diff against next is empty and this PR only adds main as a second parent. It must be merged with a merge commit, not squashed or rebased: either would drop that parent and leave the conflict in place.
Model: opus-5-5
Merges `main` into `next` with a real merge commit, so `main` is an ancestor of `next` and the milestone PR https://git.eeqj.de/sneak/webhooker/pulls/380 merges again. Implements https://git.eeqj.de/sneak/webhooker/issues/497.
https://git.eeqj.de/sneak/webhooker/pulls/416 brought to `main` a copy of fixes `next` already had in its own form. Only `script/test` conflicted. It keeps `next`'s version, which already does everything `main`'s does: no `-v`, the `-p 4 -parallel 8` memory cap, plus coverage and a `-v` rerun of failed tests. The other four files `main` changed (`internal/database/password.go`, `internal/database/password_test.go`, `internal/database/export_test.go`, `internal/resetpw/resetpw_test.go`) merged on their own, because `main`'s lines in them are the same as `next`'s. That leaves one test-hashing cost and one `script/test`.
What the diff does not show: the merged tree is identical to `next`'s, so the diff against `next` is empty and this PR only adds `main` as a second parent. It must be merged with a merge commit, not squashed or rebased: either would drop that parent and leave the conflict in place.
Model: opus-5-5
The `main` side of #414: the two changes that make `next` green, and nothing else from `next`. Each is its own commit, so it can be compared with its `next` counterpart.
- #404, as merged to `next`: a test binary hashes passwords at a 1 MB Argon2id cost instead of 64 MB, `TestHashPassword_ShippedParameters` keeps the shipped cost covered, and `script/test` runs at most four packages and eight parallel tests at once. Every test that starts a database hashed the admin password at 64 MB, which on a busy host made `internal/handlers` overrun its application start and its 90-second timeout. That is what turned `main` red.
- #415: `script/test` runs without `-v`, so the build log, which the Docker build cuts off at 2 MiB, carries one result line per package and, for a package that fails, everything its tests wrote, application log lines included, instead of only passing packages.
What the diff does not show: `script/test` differs from `next` by one line. `main` has no `script/assets` yet, so it is not called. Several packages failing at once can still reach the 2 MiB limit.
- Judgement call: both commits keep their subjects from `next`, including their `closes` references.
- Deviation and not fixed here: the same two as on #415 (no `-v` rerun on failure, #315; remaining sensitivity to extreme CPU load, #225).
Model: opus-5-5
Co-authored-by: sneak <sneak@sneak.berlin>
Reviewed-on: #416
Co-authored-by: clawbot <35+clawbot@noreply.example.org>
Makes main an ancestor of next, so the milestone PR merges again.
script/test conflicted and keeps next's version, which already runs
without -v, caps memory with -p 4 -parallel 8, adds coverage and reruns
failed tests with -v. password.go, password_test.go, export_test.go and
resetpw_test.go merged on their own: main's lines there are the same
as next's. The merged tree equals next's.
Model: opus-5-5
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Merges
mainintonextwith a real merge commit, somainis an ancestor ofnextand the milestone PR #380 merges again. Implements #497.#416 brought to
maina copy of fixesnextalready had in its own form. Onlyscript/testconflicted. It keepsnext's version, which already does everythingmain's does: no-v, the-p 4 -parallel 8memory cap, plus coverage and a-vrerun of failed tests. The other four filesmainchanged (internal/database/password.go,internal/database/password_test.go,internal/database/export_test.go,internal/resetpw/resetpw_test.go) merged on their own, becausemain's lines in them are the same asnext's. That leaves one test-hashing cost and onescript/test.What the diff does not show: the merged tree is identical to
next's, so the diff againstnextis empty and this PR only addsmainas a second parent. It must be merged with a merge commit, not squashed or rebased: either would drop that parent and leave the conflict in place.Model: opus-5-5
Review passed.
Model: opus-5-5