From 63f3c2d3f57d22a3f4fdbfbe7ec1acd29fc74d73 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 7 Apr 2024 13:44:15 +0800 Subject: [PATCH] deps: Go, rocksdb, grocksdb (#146) * build(deps): bump github.com/linxGnu/grocksdb from 1.8.12 to 1.8.14 Bumps [github.com/linxGnu/grocksdb](https://github.com/linxGnu/grocksdb) from 1.8.12 to 1.8.14. - [Release notes](https://github.com/linxGnu/grocksdb/releases) - [Commits](https://github.com/linxGnu/grocksdb/compare/v1.8.12...v1.8.14) --- updated-dependencies: - dependency-name: github.com/linxGnu/grocksdb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * update rocksdb in the dockerfile that the tests run in * bump go update minimum golang * use correct go version when linting in ci * explicitly set go version --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/govulncheck.yml | 2 +- .github/workflows/lint.yml | 3 +++ README.md | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- tools/Dockerfile | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 2edad36..6611e67 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/checkout@v4 - uses: technote-space/get-diff-action@v6 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 26d8e58..1217e89 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,6 +14,9 @@ jobs: container: cometbft/cometbft-db-testing steps: - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.22" - uses: golangci/golangci-lint-action@v4.0.0 with: args: --timeout 10m diff --git a/README.md b/README.md index fbd0cd7..cc48152 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ recommend depending on this library for new projects. ## Minimum Go Version -Go 1.21+ +Go 1.22+ ## Supported Database Backends diff --git a/go.mod b/go.mod index 8c8bff1..e212f75 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/cometbft/cometbft-db -go 1.21 +go 1.22.1 require ( github.com/cockroachdb/pebble v1.1.0 github.com/dgraph-io/badger/v2 v2.2007.4 github.com/google/btree v1.1.2 github.com/jmhodges/levigo v1.0.0 - github.com/linxGnu/grocksdb v1.8.12 + github.com/linxGnu/grocksdb v1.8.14 github.com/stretchr/testify v1.9.0 github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca go.etcd.io/bbolt v1.3.9 diff --git a/go.sum b/go.sum index 8fce8f0..e4354f1 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/linxGnu/grocksdb v1.8.12 h1:1/pCztQUOa3BX/1gR3jSZDoaKFpeHFvQ1XrqZpSvZVo= -github.com/linxGnu/grocksdb v1.8.12/go.mod h1:xZCIb5Muw+nhbDK4Y5UJuOrin5MceOuiXkVUR7vp4WY= +github.com/linxGnu/grocksdb v1.8.14 h1:HTgyYalNwBSG/1qCQUIott44wU5b2Y9Kr3z7SK5OfGQ= +github.com/linxGnu/grocksdb v1.8.14/go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= diff --git a/tools/Dockerfile b/tools/Dockerfile index a458304..81f6473 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -7,7 +7,7 @@ # updates here, merge the changes here first and let the image get updated (or # push a new version manually) before PRs that depend on them. -FROM golang:1.21 AS build +FROM golang:1.22 AS build ENV LD_LIBRARY_PATH=/usr/local/lib @@ -18,7 +18,7 @@ RUN apt update \ libleveldb-dev libleveldb1d FROM build AS install -ARG ROCKSDB=8.9.1 +ARG ROCKSDB=8.11.3 # Install Rocksdb RUN \