From e79ea8e65d11f128f064261c8014dac8f8cb2e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coffeegoddd=E2=98=95=EF=B8=8F=E2=9C=A8?= Date: Wed, 15 Jul 2026 13:14:34 -0700 Subject: [PATCH] /{.github,docs,engdocs,go,internal,scripts}: bump dolt --- .github/workflows/main.yml | 2 +- .github/workflows/pr-risk.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/regression.yml | 2 +- docs/getting-started/sync-setup.md | 4 ++-- engdocs/TESTING.md | 2 +- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- internal/storage/dolt/git_remote_test.go | 2 +- internal/testutil/testdoltcommon.go | 2 +- scripts/test-git-remote.sh | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index abb130301..24ee808a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -523,7 +523,7 @@ jobs: - name: Pull Dolt sql-server image # Keep tag in sync with internal/testutil/testdoltcommon.go:DoltDockerImage. # Without this, RequireDoltContainer reports doltNoImage and TestDomainDB skips. - run: docker pull dolthub/dolt-sql-server:2.1.10 + run: docker pull dolthub/dolt-sql-server:2.2.0 - name: Download build artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 diff --git a/.github/workflows/pr-risk.yml b/.github/workflows/pr-risk.yml index fe74d5c26..9c4c743f4 100644 --- a/.github/workflows/pr-risk.yml +++ b/.github/workflows/pr-risk.yml @@ -233,7 +233,7 @@ jobs: # Presence of this image flips isDoltImageCached() true, so the suite # exercises server Dolt instead of self-skipping. Keep the tag in sync # with internal/testutil/testdoltcommon.go:DoltDockerImage. - run: docker pull dolthub/dolt-sql-server:2.1.10 + run: docker pull dolthub/dolt-sql-server:2.2.0 - name: Test # Server twin of test-embedded-conformance: same conformance.RunAll, but diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index bde73123b..cbeb17330 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -429,7 +429,7 @@ jobs: - name: Pull Dolt sql-server image # Keep tag in sync with internal/testutil/testdoltcommon.go:DoltDockerImage. # Without this, RequireDoltContainer reports doltNoImage and TestDomainDB skips. - run: docker pull dolthub/dolt-sql-server:2.1.10 + run: docker pull dolthub/dolt-sql-server:2.2.0 - name: Download build artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 @@ -489,7 +489,7 @@ jobs: - name: Pull Dolt sql-server image # Keep tag in sync with internal/testutil/testdoltcommon.go:DoltDockerImage. - run: docker pull dolthub/dolt-sql-server:2.1.10 + run: docker pull dolthub/dolt-sql-server:2.2.0 - name: Protocol conformance + corpus golden + determinism # Require a live Dolt store here: this is the gate that must exercise the diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 196e2ac4c..00e2e4f2b 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -109,7 +109,7 @@ jobs: # has a known cleanup race (see beads issue: TestCreateWithParentFlag # TempDir RemoveAll "directory not empty" flake). Keep the tag in sync # with internal/testutil/testdoltcommon.go:DoltDockerImage. - run: docker pull dolthub/dolt-sql-server:2.1.10 + run: docker pull dolthub/dolt-sql-server:2.2.0 - name: Cache baseline binary uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v5 diff --git a/docs/getting-started/sync-setup.md b/docs/getting-started/sync-setup.md index 039685947..76b1aba05 100644 --- a/docs/getting-started/sync-setup.md +++ b/docs/getting-started/sync-setup.md @@ -12,13 +12,13 @@ You need two tools installed on every machine: | Tool | Minimum Version | Install | |------|-----------------|---------| | **bd** (beads CLI) | 0.59.0+ | See [Installation](/getting-started/installation) | -| **Dolt** | 2.1.10+ | `brew install dolt` or [dolt install script](https://github.com/dolthub/dolt/releases/latest/download/install.sh) | +| **Dolt** | 2.2.0+ | `brew install dolt` or [dolt install script](https://github.com/dolthub/dolt/releases/latest/download/install.sh) | Verify both are installed: ```bash bd version # must be 0.59.0+ -dolt version # must be 2.1.10+ +dolt version # must be 2.2.0+ ``` ## Initial Setup (First Computer) diff --git a/engdocs/TESTING.md b/engdocs/TESTING.md index 2cefc22fc..2f6244cfe 100644 --- a/engdocs/TESTING.md +++ b/engdocs/TESTING.md @@ -105,7 +105,7 @@ runs the same check. ```bash # Pull the exact Dolt image to enable integration tests -docker pull dolthub/dolt-sql-server:2.1.10 +docker pull dolthub/dolt-sql-server:2.2.0 # Point tests at an existing Dolt server (skips container startup) BEADS_DOLT_PORT=3308 ./scripts/test.sh diff --git a/go.mod b/go.mod index 7e5f82fed..abfdb204a 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/JohannesKaufmann/html-to-markdown/v2 v2.5.2 github.com/anthropics/anthropic-sdk-go v1.45.0 github.com/cenkalti/backoff/v4 v4.3.0 - github.com/dolthub/driver/v2 v2.1.10 + github.com/dolthub/driver/v2 v2.2.0 github.com/dolthub/eventkit v0.0.0-20260611184414-99f5693e696a github.com/go-sql-driver/mysql v1.10.0 github.com/jackc/pgx/v5 v5.10.0 @@ -142,12 +142,12 @@ 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.20260626152440-45335d44ad79 + 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/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.20260625203541-6a48e3d35f94 // indirect + github.com/dolthub/go-mysql-server v0.20.1-0.20260713210757-6d01d00bbbf3 // indirect 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 @@ -255,7 +255,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/crypto v0.51.0 // indirect + golang.org/x/crypto v0.52.0 // indirect golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect golang.org/x/mod v0.36.0 // indirect golang.org/x/net v0.55.0 // indirect diff --git a/go.sum b/go.sum index 4aa860f52..29901bb04 100644 --- a/go.sum +++ b/go.sum @@ -435,10 +435,10 @@ 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.20260626152440-45335d44ad79 h1:jglYHtNhgm90ePaU8JQGREbI8oZXuMuZnocUF8047LI= -github.com/dolthub/dolt/go v0.40.5-0.20260626152440-45335d44ad79/go.mod h1:Pls391pPY0J/AojRBhmZchPRdQ9Ut4QU9x6p0bZ9/X4= -github.com/dolthub/driver/v2 v2.1.10 h1:fuHOx55CFnu3KMcS61nojQwp4iC/YcpGJWqEySLN468= -github.com/dolthub/driver/v2 v2.1.10/go.mod h1:K8QxerpsiSNHlEId6zHhdp3r2K74I8dmsuE0C4KmjSg= +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/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= @@ -449,8 +449,8 @@ 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.20260625203541-6a48e3d35f94 h1:BYrDFKtMbSyst6pBX9o3pjc7WV/oZhfeeX2HI1disnc= -github.com/dolthub/go-mysql-server v0.20.1-0.20260625203541-6a48e3d35f94/go.mod h1:mj5/QX3V8i92REbA1w6CzyknJAFdKtdE7l931405C/E= +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/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= @@ -1151,8 +1151,8 @@ golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= -golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= +golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= +golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= diff --git a/internal/storage/dolt/git_remote_test.go b/internal/storage/dolt/git_remote_test.go index b747c640b..b35605022 100644 --- a/internal/storage/dolt/git_remote_test.go +++ b/internal/storage/dolt/git_remote_test.go @@ -37,7 +37,7 @@ import ( // so we avoid it entirely and verify via `dolt sql -q ... -r csv`. // // Prerequisites: -// - dolt >= 2.1.10 +// - dolt >= 2.2.0 // - git CLI available // // Run: diff --git a/internal/testutil/testdoltcommon.go b/internal/testutil/testdoltcommon.go index 43d644ecb..55313b216 100644 --- a/internal/testutil/testdoltcommon.go +++ b/internal/testutil/testdoltcommon.go @@ -11,7 +11,7 @@ import ( ) // DoltDockerImage is the Docker image used for Dolt test containers. -const DoltDockerImage = "dolthub/dolt-sql-server:2.1.10" +const DoltDockerImage = "dolthub/dolt-sql-server:2.2.0" // RequireDoltBinary ensures the `dolt` CLI binary is available. The test is // skipped locally when dolt is missing but fatally fails under GitHub Actions diff --git a/scripts/test-git-remote.sh b/scripts/test-git-remote.sh index 42e1a959e..c46d798bd 100755 --- a/scripts/test-git-remote.sh +++ b/scripts/test-git-remote.sh @@ -8,7 +8,7 @@ # ./scripts/test-git-remote.sh # Local bare git repo (default) # ./scripts/test-git-remote.sh # Push to real GitHub repo # -# Requirements: bd, dolt (>= 2.1.10), git +# Requirements: bd, dolt (>= 2.2.0), git # # The script is self-contained: creates temp dirs, cleans up on exit.