diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml
index b36de99cf..52e887069 100644
--- a/.github/workflows/check-generated.yml
+++ b/.github/workflows/check-generated.yml
@@ -43,7 +43,11 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: "1.22.2"
+=======
+ go-version: "1.22.5"
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: actions/checkout@v4
with:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 6dc0b8e24..7abe92595 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -12,7 +12,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: "1.22.2"
+=======
+ go-version: "1.22.5"
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- name: Create a file with all the pkgs
run: go list ./... > pkgs.txt
- name: Split pkgs into 4 files
@@ -48,8 +52,13 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: "1.22.2"
- uses: actions/checkout@v4
+=======
+ go-version: "1.22.5"
+ - uses: actions/checkout@v3
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
@@ -70,8 +79,13 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: "1.22.2"
- uses: actions/checkout@v4
+=======
+ go-version: "1.22.5"
+ - uses: actions/checkout@v3
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
index aa0fdbe9b..39bc1f8bf 100644
--- a/.github/workflows/e2e-manual.yml
+++ b/.github/workflows/e2e-manual.yml
@@ -16,7 +16,11 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: '1.22.2'
+=======
+ go-version: '1.22.5'
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: actions/checkout@v4
diff --git a/.github/workflows/e2e-nightly-34x.yml b/.github/workflows/e2e-nightly-34x.yml
index fbc0d1c07..989e320d0 100644
--- a/.github/workflows/e2e-nightly-34x.yml
+++ b/.github/workflows/e2e-nightly-34x.yml
@@ -23,7 +23,11 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: '1.22.2'
+=======
+ go-version: '1.22.5'
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: actions/checkout@v4
with:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index f15ae6efb..5df24181d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -14,7 +14,11 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: '1.22.2'
+=======
+ go-version: '1.22.5'
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6
with:
diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml
index 43a5130e5..dd099bab7 100644
--- a/.github/workflows/fuzz-nightly.yml
+++ b/.github/workflows/fuzz-nightly.yml
@@ -11,7 +11,11 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: '1.22.2'
+=======
+ go-version: '1.22.5'
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: actions/checkout@v4
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 2456c89e3..ac01fab5d 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -16,7 +16,11 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
+<<<<<<< HEAD
go-version: "1.22.2"
+=======
+ go-version: "1.22.5"
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6
with:
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index 2a6cd2980..aa4ec63d4 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -18,7 +18,11 @@ jobs:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: '1.22.2'
+=======
+ go-version: '1.22.5'
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
# Similar check to ./release-version.yml, but enforces this when pushing
# tags. The ./release-version.yml check can be bypassed and is mainly
diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml
index a080834af..5fadeebc5 100644
--- a/.github/workflows/release-version.yml
+++ b/.github/workflows/release-version.yml
@@ -15,7 +15,11 @@ jobs:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: '1.22.2'
+=======
+ go-version: '1.22.5'
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- name: Check version
run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 32687945f..24215c566 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,11 @@ jobs:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: '1.22.2'
+=======
+ go-version: '1.22.5'
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- name: Generate release notes
run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f4cde15b2..69e6a8da9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,7 +25,11 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
+<<<<<<< HEAD
go-version: "1.22.2"
+=======
+ go-version: "1.22.5"
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
- uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6
with:
@@ -121,7 +125,11 @@ jobs:
# steps:
# - uses: actions/setup-go@v3
# with:
+<<<<<<< HEAD
# go-version: "1.22.2"
+=======
+ # go-version: "1.22.5"
+>>>>>>> f03f8ec17 (chore: upgrades go version to 1.22.5 in main (#1434))
# - uses: actions/checkout@v3
# - uses: technote-space/get-diff-action@v6
# with:
diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
index c1ee8ad8e..f642c2431 100644
--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -1,6 +1,6 @@
# Use a build arg to ensure that both stages use the same,
# hopefully current, go version.
-ARG GOLANG_BASE_IMAGE=golang:1.22.4-alpine
+ARG GOLANG_BASE_IMAGE=golang:1.22.5-alpine
# stage 1 Generate CometBFT Binary
FROM --platform=$BUILDPLATFORM $GOLANG_BASE_IMAGE as builder
diff --git a/README.md b/README.md
index 8bf3f2a7e..5d26b933d 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ This repo intends on preserving the minimal possible diff with [cometbft/cometbf
- **specific to Celestia**: consider if [celestia-app](https://github.com/celestiaorg/celestia-app) is a better target
- **not specific to Celestia**: consider making the contribution upstream in CometBFT
-1. [Install Go](https://go.dev/doc/install) 1.22.4+
+1. [Install Go](https://go.dev/doc/install) 1.22.5+
2. Fork this repo
3. Clone your fork
4. Find an issue to work on (see [good first issues](https://github.com/celestiaorg/celestia-core/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22))
diff --git a/go.mod b/go.mod
index 7da31d49b..0b770cedf 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/tendermint/tendermint
-go 1.22.4
+go 1.22.5
require (
github.com/BurntSushi/toml v1.2.1
diff --git a/scripts/proto-gen.sh b/scripts/proto-gen.sh
index 4cf065632..545648045 100755
--- 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.22.4-alpine sh <<"EOF"
+docker run --rm -i -v "$PWD":/w --workdir=/w golang:1.22.5-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
index 364589845..23b66cd6c 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.4
+FROM golang:1.22.5
# Grab deps (jq, hexdump, xxd, killall)
RUN apt-get update && \
diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile
index 41d0fc493..c90a7e29e 100644
--- a/test/e2e/docker/Dockerfile
+++ b/test/e2e/docker/Dockerfile
@@ -1,7 +1,7 @@
# 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.22.4-bullseye
+FROM golang:1.22.5-bullseye
RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null
RUN apt-get -qq install -y libleveldb-dev librocksdb-dev >/dev/null