Skip to content

Commit

Permalink
Merge branch 'main' into faddat/bbolt-cve-toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
melekes committed Apr 7, 2024
2 parents 7fd7492 + 63f3c2d commit 1297537
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/govulncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.22.2"
check-latest: true
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.22.2"
go-version: "1.22"
- uses: golangci/golangci-lint-action@v4.0.0
with:
args: --timeout 10m
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ recommend depending on this library for new projects.

## Minimum Go Version

Go 1.21+
Go 1.22+

## Supported Database Backends

Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ module github.com/cometbft/cometbft-db

go 1.22

toolchain go1.22.2

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.4.0-alpha.0.0.20240404170359-43604f3112c5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.22.2 AS build
FROM golang:1.22 AS build

ENV LD_LIBRARY_PATH=/usr/local/lib

Expand All @@ -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 \
Expand Down

0 comments on commit 1297537

Please sign in to comment.