From f0e7fba53ea0c3741d97c318e5c3f42a1ff215ff Mon Sep 17 00:00:00 2001 From: Rootul P Date: Wed, 2 Oct 2024 09:33:53 -0400 Subject: [PATCH] chore: upgrade to Go 1.23.1 (#3848) ## Description Upgrade to Go 1.23.1 motivated by https://github.com/celestiaorg/celestia-app/pull/3847. I had to modify GoReleaser config because https://github.com/goreleaser/goreleaser/issues/5127. Maintainers need to update their local golangic-lint binary to v1.61.0. See [golangci-lint install](https://golangci-lint.run/welcome/install/). --------- Co-authored-by: CHAMI Rachid --- .github/workflows/lint.yml | 3 +-- .goreleaser.yaml | 2 +- Makefile | 10 ++++++---- README.md | 4 ++-- docker/Dockerfile | 2 +- docker/txsim/Dockerfile | 2 +- go.mod | 2 +- go.work.example | 2 +- test/interchain/go.mod | 2 +- tools/blocketa/README.md | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a148d3f6f0..999eaf166b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,10 +22,9 @@ jobs: go.sum - uses: golangci/golangci-lint-action@v6.1.0 with: - version: v1.59.1 + version: v1.61.0 args: --timeout 10m github-token: ${{ secrets.github_token }} - skip-pkg-cache: true if: env.GIT_DIFF # hadolint lints the Dockerfile diff --git a/.goreleaser.yaml b/.goreleaser.yaml index f36e8e0435..120d8762dc 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -108,7 +108,7 @@ archives: checksum: name_template: "checksums.txt" snapshot: - name_template: "{{ incpatch .Version }}-next" + version_template: "{{ incpatch .Version }}-next" changelog: sort: asc filters: diff --git a/Makefile b/Makefile index f9d1f279de..83c8fe3a03 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,13 @@ DOCKER_PROTO_BUILDER := docker run -v $(shell pwd):/workspace --workdir /workspa PROJECTNAME=$(shell basename "$(PWD)") HTTPS_GIT := https://github.com/celestiaorg/celestia-app.git PACKAGE_NAME := github.com/celestiaorg/celestia-app/v3 -GOLANG_CROSS_VERSION ?= v1.22.6 +# Before upgrading the GOLANG_CROSS_VERSION, please verify that a Docker image exists with the new tag. +# See https://github.com/goreleaser/goreleaser-cross/pkgs/container/goreleaser-cross +GOLANG_CROSS_VERSION ?= v1.23.1 # Set this to override the max square size of the binary -OVERRIDE_MAX_SQUARE_SIZE ?= +OVERRIDE_MAX_SQUARE_SIZE ?= # Set this to override the upgrade height delay of the binary -OVERRIDE_UPGRADE_HEIGHT_DELAY ?= +OVERRIDE_UPGRADE_HEIGHT_DELAY ?= # process linker flags ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=celestia-app \ @@ -253,4 +255,4 @@ enable-bbr: else \ echo "BBR is already enabled."; \ fi -.PHONY: enable-bbr \ No newline at end of file +.PHONY: enable-bbr diff --git a/README.md b/README.md index f1f94636c7..8d94c06884 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ node | | | | ### Source -1. [Install Go](https://go.dev/doc/install) 1.22.6 +1. [Install Go](https://go.dev/doc/install) 1.23.1 1. Clone this repo 1. Install the celestia-app CLI @@ -134,7 +134,7 @@ This repo contains multiple go modules. When using it, rename `go.work.example` ### Tools -1. Install [golangci-lint](https://golangci-lint.run/welcome/install) 1.59.1 +1. Install [golangci-lint](https://golangci-lint.run/welcome/install) 1.61.0 1. Install [markdownlint](https://github.com/DavidAnson/markdownlint) 0.39.0 1. Install [hadolint](https://github.com/hadolint/hadolint) 1. Install [yamllint](https://yamllint.readthedocs.io/en/stable/quickstart.html) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2b504642db..0e3c4bf51d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,7 @@ # # Separating the builder and runtime image allows the runtime image to be # considerably smaller because it doesn't need to have Golang installed. -ARG BUILDER_IMAGE=docker.io/golang:1.22.6-alpine3.19 +ARG BUILDER_IMAGE=docker.io/golang:1.23.1-alpine3.20 ARG RUNTIME_IMAGE=docker.io/alpine:3.19 ARG TARGETOS ARG TARGETARCH diff --git a/docker/txsim/Dockerfile b/docker/txsim/Dockerfile index 9ffa797ac7..563a06ab09 100644 --- a/docker/txsim/Dockerfile +++ b/docker/txsim/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: generate txsim binary -FROM --platform=$BUILDPLATFORM docker.io/golang:1.22.6-alpine3.19 as builder +FROM --platform=$BUILDPLATFORM docker.io/golang:1.23.1-alpine3.20 as builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 42b518927a..19279ba25d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/celestiaorg/celestia-app/v3 -go 1.22.6 +go 1.23.1 require ( cosmossdk.io/errors v1.0.1 diff --git a/go.work.example b/go.work.example index 85b25f4976..64b0c2f5d2 100644 --- a/go.work.example +++ b/go.work.example @@ -1,4 +1,4 @@ -go 1.22.6 +go 1.23.1 use ( . diff --git a/test/interchain/go.mod b/test/interchain/go.mod index bbcd6956b1..2b6b52b585 100644 --- a/test/interchain/go.mod +++ b/test/interchain/go.mod @@ -1,6 +1,6 @@ module github.com/celestiaorg/celestia-app/test/interchain -go 1.22.6 +go 1.23.1 require ( cosmossdk.io/math v1.3.0 diff --git a/tools/blocketa/README.md b/tools/blocketa/README.md index f7de7539b5..1f8c2b4d1b 100644 --- a/tools/blocketa/README.md +++ b/tools/blocketa/README.md @@ -15,4 +15,4 @@ arrivalTime: 2024-08-28 17:24:23.483542677 +0000 UTC ``` > [!NOTE] -> The block time is currently hard-coded. If you're running this for a network with a different block time, you'll need to update the `blockTime` constant in the main.go file. You can use [https://www.mintscan.io/celestia/block](https://www.mintscan.io/celestia/block/) or the blocktime tool. +> The block time is currently hard-coded. If you're running this for a network with a different block time, you'll need to update the `blockTime` constant in the main.go file. You can use [https://www.mintscan.io/celestia/block](https://www.mintscan.io/celestia/block/) or the blocktime tool. \ No newline at end of file