Skip to content

Commit

Permalink
chore: upgrade to Go 1.23.1 (#3848)
Browse files Browse the repository at this point in the history
## Description

Upgrade to Go 1.23.1 motivated by
#3847. I had to modify
GoReleaser config because
goreleaser/goreleaser#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 <chamirachid1@gmail.com>
  • Loading branch information
rootulp and rach-id authored Oct 2, 2024
1 parent 9f0ba4e commit f0e7fba
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 15 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -253,4 +255,4 @@ enable-bbr:
else \
echo "BBR is already enabled."; \
fi
.PHONY: enable-bbr
.PHONY: enable-bbr
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/txsim/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.work.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.6
go 1.23.1

use (
.
Expand Down
2 changes: 1 addition & 1 deletion test/interchain/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/blocketa/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit f0e7fba

Please sign in to comment.