Skip to content

Commit

Permalink
chore(deps): Bump Go from 1.20 to 1.22 (#1410)
Browse files Browse the repository at this point in the history
* Bump Go from 1.20 to 1.22.4

* follow golangci-lint rule

* Change ghaction go version

* Change the go version of all docker files

* add go version to split-test-files

* Replace slice header because it's deprecated since go 1.21

* Add CHANGELOG

* Update subdirs go version

(cherry picked from commit 7ebd36f)

# Conflicts:
#	.github/workflows/check-generated.yml
#	.github/workflows/lint.yml
#	.github/workflows/release-sims.yml
#	.github/workflows/test.yml
#	CHANGELOG.md
#	go.sum
#	tools/error_doc/go.mod
  • Loading branch information
tkxkd0159 authored and mergify[bot] committed Jun 7, 2024
1 parent 9c2bf2d commit 837c543
Show file tree
Hide file tree
Showing 19 changed files with 176 additions and 35 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Verify that generated code is up-to-date.

name: Check generated code
on:
workflow_dispatch:
pull_request:
branches:
- '*'

permissions:
contents: read

jobs:
check-error-doc:
runs-on: ubuntu-latest
steps:
- name: Setup Golang
uses: actions/setup-go@v5
with:
go-version: '1.22'

- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Check generated error docs
run: |
make error-doc-gen
if ! git diff --stat --exit-code ; then
echo ">> ERROR:"
echo ">>"
echo ">> Error documents require update (source files in x folder may have changed)."
echo ">> Ensure your tools are up-to-date, re-run 'make error-doc' and update this PR."
echo ">>"
exit 1
fi
5 changes: 5 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ jobs:
steps:
- uses: actions/[email protected]
with:
<<<<<<< HEAD
go-version: '1.20'
- uses: actions/checkout@v3
=======
go-version: '1.22'
- uses: actions/checkout@v4
>>>>>>> 7ebd36fc4 (chore(deps): Bump Go from 1.20 to 1.22 (#1410))
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- uses: ./.github/actions/generate-swagger
- name: diff
run: git diff
Expand Down
19 changes: 17 additions & 2 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- run: |
make build
Expand All @@ -39,7 +39,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: install runsim
run: |
export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
Expand All @@ -55,8 +55,13 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
<<<<<<< HEAD
go-version: '1.20'
- uses: actions/[email protected]
=======
go-version: '1.22'
- uses: actions/[email protected]
>>>>>>> 7ebd36fc4 (chore(deps): Bump Go from 1.20 to 1.22 (#1410))
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -75,8 +80,13 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
<<<<<<< HEAD
go-version: '1.20'
- uses: actions/[email protected]
=======
go-version: '1.22'
- uses: actions/[email protected]
>>>>>>> 7ebd36fc4 (chore(deps): Bump Go from 1.20 to 1.22 (#1410))
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -95,8 +105,13 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
<<<<<<< HEAD
go-version: '1.20'
- uses: actions/[email protected]
=======
go-version: '1.22'
- uses: actions/[email protected]
>>>>>>> 7ebd36fc4 (chore(deps): Bump Go from 1.20 to 1.22 (#1410))
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- run: make build
Expand All @@ -37,7 +37,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- name: Install runsim
Expand All @@ -54,7 +54,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand All @@ -81,7 +81,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sims_normal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- run: make build
Expand All @@ -24,7 +24,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- name: Install runsim
Expand All @@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: actions/[email protected]
Expand All @@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: actions/[email protected]
Expand All @@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: actions/[email protected]
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- name: install tparse
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- uses: technote-space/[email protected]
id: git_diff
with:
Expand All @@ -70,7 +70,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand All @@ -88,7 +88,14 @@ jobs:
split-test-files:
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD
- uses: actions/checkout@v3
=======
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
>>>>>>> 7ebd36fc4 (chore(deps): Bump Go from 1.20 to 1.22 (#1410))
- name: Create a file with all the pkgs
run: go list ./... > pkgs.txt
- name: Split pkgs into 4 files
Expand Down Expand Up @@ -122,7 +129,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down Expand Up @@ -204,7 +211,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.22'
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,13 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Event Breaking Changes

### Build, CI
<<<<<<< HEAD
=======
* (ci) [\#1078](https://github.com/Finschia/finschia-sdk/pull/1078) fix tag comments in github actions workflow docker.yml
* (repo) [\#1157](https://github.com/Finschia/finschia-sdk/pull/1157) setup CODEOWNERS and backport action
* (ci) [\#1160](https://github.com/Finschia/finschia-sdk/pull/1160) remove autopr ci
* (repo) [\#1356](https://github.com/Finschia/finschia-sdk/pull/1356) add v0.49.x for backport action
* (build, ci) [\#1410](https://github.com/Finschia/finschia-sdk/pull/1410) Bump Go from 1.20 to 1.22
>>>>>>> 7ebd36fc4 (chore(deps): Bump Go from 1.20 to 1.22 (#1410))
### Document Updates
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys add foo
# > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys list
# TODO: demo connecting rest-server (or is this in server now?)
FROM golang:1.20-alpine AS build-env
FROM golang:1.22-alpine AS build-env
ARG ARCH=$ARCH

# Install minimum necessary dependencies,
Expand Down
2 changes: 1 addition & 1 deletion contrib/devtools/dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bufbuild/buf:latest as BUILDER

FROM golang:alpine
FROM golang:1.22-alpine

ENV GOLANG_PROTOBUF_VERSION=1.3.5 \
GOGO_PROTOBUF_VERSION=1.3.2 \
Expand Down
2 changes: 1 addition & 1 deletion contrib/images/simd-dlv/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine AS build
FROM golang:1.22-alpine AS build
RUN apk add build-base git linux-headers libc-dev
RUN go install github.com/go-delve/delve/cmd/dlv@latest
WORKDIR /work
Expand Down
2 changes: 1 addition & 1 deletion contrib/images/simd-env/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine AS build
FROM golang:1.22-alpine AS build
RUN apk add build-base git linux-headers
WORKDIR /work
COPY go.mod go.sum /work/
Expand Down
2 changes: 1 addition & 1 deletion contrib/rosetta/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine as build
FROM golang:1.22-alpine as build

RUN apk add --no-cache tar

Expand Down
2 changes: 1 addition & 1 deletion contrib/rosetta/rosetta-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine as build
FROM golang:1.22-alpine as build

RUN apk add git gcc libc-dev --no-cache

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.20
go 1.22

module github.com/Finschia/finschia-sdk

Expand Down
Loading

0 comments on commit 837c543

Please sign in to comment.