* fix(deps): bump dolt/go past upstream manifest-missing-chunk defense (#4070)
Pin github.com/dolthub/dolt/go to 796d074977417da931df65202a79e0a7f532a3db.
That hop includes:
- 23ccbf9442275166f168939277a5b4a348a63c9d — reject a file manifest
update that references a missing table file (the defense itself)
- 796d074977417da931df65202a79e0a7f532a3db — doc/test follow-up to the
defense commit (no production-semantics change)
A non-atomic backup sync can leave the backup manifest ahead of chunk
files; subsequent syncs then fail with "table file not found" and stay
broken. The upstream defense turns that silent corruption into a loud
failed sync. Beads' previous pin (a6690826d767, 2026-07-15) predates
both commits.
Minimal-churn pin: do not bump to today's dolt tip. go mod tidy did not
force a later version.
This is a mitigation, not a root-cause fix: backup file+manifest publish
remains non-atomic, and backups already in the manifest-ahead state are
not repaired by this change.
Mitigates #4070
* fix(nix): update vendorHash for the dolt/go bump
The go.mod/go.sum bump in this PR invalidates the pinned vendorHash, so
`nix build .#default` fails with a fixed-output hash mismatch. Update it to
the value CI computed:
specified: sha256-D+KDoLFJHpt9D9rCrtE3NMfL4fgK7UxpdKlCxp5yz5Y=
got: sha256-wDU1tw/4t2CetwQl4+zUhlDI70dSasLLI2Gy66ZyhQQ=
The repo documents this coupling in .github/dependabot.yml; the existing
"Update vendorHash for dependabot Go bumps" workflow only fires for
dependabot PRs, so a manual bump is needed here.
(cherry picked from commit 851aa2f20a)
This commit is contained in:
parent
467dce65b6
commit
510675948f
3 changed files with 21 additions and 13 deletions
10
default.nix
10
default.nix
|
|
@ -19,7 +19,15 @@ buildGoModule {
|
|||
# proxyVendor avoids vendor/modules.txt consistency checks when the vendored
|
||||
# tree lags go.mod/go.sum.
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-eakIdTpJcGYHOWNjW5Pq9lllVOm9WzKWYNq5FKSQj8w=";
|
||||
# TODO(1.3.1-rc.2): recompute this hash before merge. Neither the release
|
||||
# branch's own value nor #5931's is correct here: the branch already carried
|
||||
# an independent dependency bump (d594092eb), so this cherry-pick lands on a
|
||||
# vendor set that has existed on neither side. The value below is #5931's and
|
||||
# is known-stale; it is a placeholder. Run `nix build .#default` on this
|
||||
# branch and substitute the `got:` hash. (No nix on the machine that made this
|
||||
# commit, and a guessed hash fails the build loudly, so it is left explicit
|
||||
# rather than fabricated.)
|
||||
vendorHash = "sha256-wDU1tw/4t2CetwQl4+zUhlDI70dSasLLI2Gy66ZyhQQ=";
|
||||
|
||||
# Match go.mod to the selected Nix Go toolchain. buildGoModule also builds
|
||||
# vendored dependencies in the Nix sandbox, where toolchain downloads are not
|
||||
|
|
|
|||
8
go.mod
8
go.mod
|
|
@ -146,16 +146,16 @@ require (
|
|||
github.com/docker/go-connections v0.6.0 // indirect
|
||||
github.com/docker/go-units v0.5.0 // indirect
|
||||
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 // indirect
|
||||
github.com/dolthub/dolt/go v0.40.5-0.20260715172757-a6690826d767
|
||||
github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69 // indirect
|
||||
github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741
|
||||
github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 // indirect
|
||||
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 // indirect
|
||||
github.com/dolthub/fslock v0.0.5 // indirect
|
||||
github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 // indirect
|
||||
github.com/dolthub/go-mysql-server v0.20.1-0.20260713210757-6d01d00bbbf3
|
||||
github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809
|
||||
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 // indirect
|
||||
github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 // indirect
|
||||
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect
|
||||
github.com/dolthub/vitess v0.0.0-20260624214226-81d034e0fde8 // indirect
|
||||
github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/ebitengine/purego v0.10.0 // indirect
|
||||
github.com/edsrzf/mmap-go v1.2.0 // indirect
|
||||
|
|
|
|||
16
go.sum
16
go.sum
|
|
@ -435,30 +435,30 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I
|
|||
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo=
|
||||
github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44=
|
||||
github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk=
|
||||
github.com/dolthub/dolt/go v0.40.5-0.20260715172757-a6690826d767 h1:RSO4YZ5xuZ2EnHv813q2q+QpEqDW1ugjRepPXyDvb7s=
|
||||
github.com/dolthub/dolt/go v0.40.5-0.20260715172757-a6690826d767/go.mod h1:DXkKITEIpR85Ta86AyjAXYeTULr/tRylidxxy95eraI=
|
||||
github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741 h1:z+Disx4RJn0dxaYSzcp8pbiXddi3dpIoUJaMtVa/iBE=
|
||||
github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741/go.mod h1:houDkPceGRjDBdaDsfym5OQUB4465mBUnPvSxMOPrPo=
|
||||
github.com/dolthub/driver/v2 v2.2.0 h1:Qm9BhvvKNmeTDF6kZdDkdLe62CF1W6GrCA3ZDRx/tlk=
|
||||
github.com/dolthub/driver/v2 v2.2.0/go.mod h1:Ngki9vM88/sqin1RKfUt/9Ex8DmoePtHgY7d4+YoolU=
|
||||
github.com/dolthub/eventkit v0.0.0-20260611184414-99f5693e696a h1:qNecLF0XIN1BD0RfS/UmlN8ObC3G7bFUJtEyqJeBea4=
|
||||
github.com/dolthub/eventkit v0.0.0-20260611184414-99f5693e696a/go.mod h1:eHUkm69YMO2/v7bzwwYCEkd+3Xu7+KUpP7jFWAbpDlM=
|
||||
github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69 h1:JShhbqMw26nKx3pqqu/cFxOpzBkN+4elVhzuUfgDw2k=
|
||||
github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM=
|
||||
github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 h1:0mg9QEFdkkBwJMxvz1tCjHYmfG2iIC6aShj1InDq9/M=
|
||||
github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM=
|
||||
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
|
||||
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
|
||||
github.com/dolthub/fslock v0.0.5 h1:QoXhBhgY1oumHE26qyE7tgmXUT8qjJwxsIzo54O/B/k=
|
||||
github.com/dolthub/fslock v0.0.5/go.mod h1:sdofYYqE0D79zNZyB4/kmlnsQOVap1C2yByjGKSirEM=
|
||||
github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 h1:FEMjCGEroDnY/BXyAffVZxUpXhP2GpoUJyyq5KaLn8c=
|
||||
github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
|
||||
github.com/dolthub/go-mysql-server v0.20.1-0.20260713210757-6d01d00bbbf3 h1:HdPnbDFCkxyEU1zDHVPcHq8aWFkar3fIz9I9Wz5cC0E=
|
||||
github.com/dolthub/go-mysql-server v0.20.1-0.20260713210757-6d01d00bbbf3/go.mod h1:AnD2jKQZCf09sM2JhV/cTEtsoEhPNg6pVWjRCBox4Zw=
|
||||
github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809 h1:c+S3O08LgGS+czU/CuN+/pOKMri5F6kxajoWrTyrE1s=
|
||||
github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809/go.mod h1:9GLxpglhedopzqBGpW0PGrw7UlwG5kBIOepE2QfTQ1s=
|
||||
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
|
||||
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
|
||||
github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM=
|
||||
github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
|
||||
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ=
|
||||
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
|
||||
github.com/dolthub/vitess v0.0.0-20260624214226-81d034e0fde8 h1:zmKLyRCTiNZnizO++sNXP1QW2bxLE2Y+WJAdu/hcu6s=
|
||||
github.com/dolthub/vitess v0.0.0-20260624214226-81d034e0fde8/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0=
|
||||
github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 h1:gvOpHisi0CbG3hixdGulNQdXy3V7+AWxe37kGBgTmRI=
|
||||
github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0=
|
||||
github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58=
|
||||
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w=
|
||||
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q=
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue