Bump minimum Go version to v1.20 (#65)

* Fix lints Signed-off-by: Thane Thomson <[email protected]> * Bump minimum Go version to 1.20 Signed-off-by: Thane Thomson <[email protected]> * Install gcc 11 --------- Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: lasarojc <[email protected]>
Kava-Labs · Jun 16, 2023 · 134011f · 134011f
1 parent 6473b40
commit 134011f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,5 +16,5 @@ jobs:
       - uses: golangci/[email protected]
         with:
           args: --timeout 10m
-          version: v1.51.2
+          version: latest
           github-token: ${{ secrets.github_token }}
diff --git a/.golangci.yml b/.golangci.yml
@@ -30,3 +30,22 @@ issues:
 linters-settings:
   errcheck:
     check-blank: true
+  depguard:
+    rules:
+      main:
+        files:
+          - $all
+          - "!$test"
+        allow:
+          - $gostd
+          - github.com/cometbft
+          - github.com/syndtr/goleveldb/leveldb
+          - github.com/google/btree
+      test:
+        files:
+          - $test
+        allow:
+          - $gostd
+          - github.com/cometbft
+          - github.com/syndtr/goleveldb/leveldb
+          - github.com/stretchr/testify
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ test-all-with-coverage:
 
 lint:
 	@echo "--> Running linter"
-	@golangci-lint run
+	@go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run
 	@go mod verify
 .PHONY: lint
 

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ recommend depending on this library for new projects.
 
 ### Minimum Go Version
 
-Go 1.19+
+Go 1.20+
 
 ## Supported Database Backends
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cometbft/cometbft-db
 
-go 1.19
+go 1.20
 
 require (
 	github.com/dgraph-io/badger/v2 v2.2007.4

diff --git a/tools/Dockerfile b/tools/Dockerfile
@@ -7,13 +7,16 @@
 # 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.19-bullseye AS build
+FROM golang:1.20 AS build
 
 ENV LD_LIBRARY_PATH=/usr/local/lib
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libbz2-dev libgflags-dev libsnappy-dev libzstd-dev zlib1g-dev \
-    make tar wget
+    make tar wget build-essential gcc-11 g++-11 
+
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11 
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
 
 FROM build AS install
 ARG LEVELDB=1.20