Bump Go from 1.20 to 1.22

Finschia · Jun 18, 2024 · 20490c6 · 20490c6
1 parent 1c86eda
commit 20490c6
Show file tree

Hide file tree

Showing 19 changed files with 62 additions and 24 deletions.
diff --git a/.github/workflows/abci.yml b/.github/workflows/abci.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:
@@ -57,7 +57,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:
@@ -86,7 +86,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:
@@ -114,7 +114,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
         if: "matrix.package != ''"
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:

diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
 
       - uses: actions/checkout@v4
 
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
 
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:

diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
 
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/e2e-nightly.yml b/.github/workflows/e2e-nightly.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
 
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.22"
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:

diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
 
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
         with:

diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 Generate Ostracon Binary
-FROM golang:1.20-alpine as builder
+FROM golang:1.22-alpine as builder
 RUN apk update && \
     apk upgrade && \
     apk add --no-cache git make gcc libc-dev build-base curl jq bash file gmp-dev clang libtool autoconf automake
@@ -8,7 +8,7 @@ WORKDIR /ostracon
 RUN make build-linux
 
 # stage 2
-FROM golang:1.20-alpine
+FROM golang:1.22-alpine
 LABEL maintainer="hello@finschia.org"
 
 # Ostracon will be looking for the genesis file in /ostracon/config/genesis.json

diff --git a/Makefile b/Makefile
@@ -263,7 +263,7 @@ DOCKER_HOME = /go/src/github.com/Finschia/ostracon
 DOCKER_CMD = docker run --rm \
                         -v `pwd`:$(DOCKER_HOME) \
                         -w $(DOCKER_HOME)
-DOCKER_IMG = golang:1.20-alpine
+DOCKER_IMG = golang:1.22-alpine
 BUILD_CMD = apk add --update --no-cache git make gcc libc-dev build-base curl jq bash file gmp-dev clang libtool autoconf automake \
 	&& cd $(DOCKER_HOME) \
 	&& make build-linux

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 is forked from Tendermint Core [v0.34.8](https://github.com/tendermint/tendermint/tree/v0.34.8) on 2021-03-15.
 And we synced up with Tendermint-[v0.34.24](https://github.com/tendermint/tendermint/tree/v0.34.24) on 2023-07-24.
 
-**Node**: Requires [Go 1.20+](https://golang.org/dl/)
+**Node**: Requires [Go 1.22+](https://golang.org/dl/)
 
 **Warnings**: Initial development is in progress, but there has not yet been a stable.
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/Finschia/ostracon
 
-go 1.20
+go 1.22
 
 require (
 	github.com/BurntSushi/toml v1.3.2

diff --git a/go.sum b/go.sum
diff --git a/networks/local/localnode/Dockerfile b/networks/local/localnode/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine
+FROM golang:1.22-alpine
 
 RUN apk update && \
     apk upgrade && \

diff --git a/scripts/proto-gen.sh b/scripts/proto-gen.sh
@@ -10,7 +10,7 @@ cd "$(git rev-parse --show-toplevel)"
 
 # Run inside Docker to install the correct versions of the required tools
 # without polluting the local system.
-docker run --rm -i -v "$PWD":/w --workdir=/w golang:1.20-alpine sh <<"EOF"
+docker run --rm -i -v "$PWD":/w --workdir=/w golang:1.22-alpine sh <<"EOF"
 apk add git make
 
 go install github.com/bufbuild/buf/cmd/buf

diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.22
 
 # Grab deps (jq, hexdump, xxd, killall)
 RUN apt-get update && \

diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile
@@ -1,13 +1,13 @@
 # We need to build in a Linux environment to support C libraries, e.g. RocksDB.
 # We use Debian instead of Alpine, so that we can use binary database packages
 # instead of spending time compiling them.
-FROM golang:1.20
+FROM golang:1.22
 
 RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null
 RUN apt-get -qq install -y libleveldb-dev make libc-dev libtool >/dev/null
 
 # RocksDB 6.24.2+ is required to build with tm-db 0.6.7 (but RocksDB 7.x is not yet supported).
-# librocksdb-dev installed by apt with golang:1.20 is 7.8.3-2, so we have to build it from the latest 6.x sources.
+# librocksdb-dev installed by apt with golang:1.22 is 7.8.3-2, so we have to build it from the latest 6.x sources.
 ARG ROCKSDB_VERSION=6.29.5
 ARG ROCKSDB_FILE=rocksdb-v${ROCKSDB_VERSION}.tar.gz
 ARG ROCKSDB_DIR=rocksdb-${ROCKSDB_VERSION}

diff --git a/tools/proto/Dockerfile b/tools/proto/Dockerfile
@@ -1,6 +1,6 @@
 FROM bufbuild/buf:latest as buf
 
-FROM golang:1.20-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --update --no-cache build-base curl git upx && \
   rm -rf /var/cache/apk/*