From 660c40ff48026f94eea56db08569af552375f42e Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Fri, 24 May 2024 13:19:26 +0200 Subject: [PATCH 1/4] deps: bump go 1.22 --- .github/workflows/callbacks.yml | 6 +++--- .github/workflows/capability.yml | 4 ++-- .github/workflows/e2e-compatibility-workflow-call.yaml | 2 +- .github/workflows/e2e-fork.yml | 8 ++++---- .github/workflows/e2e-test-workflow-call.yml | 4 ++-- .github/workflows/e2e-wasm.yaml | 2 +- .github/workflows/e2e.yaml | 2 +- .github/workflows/e2emodule.yml | 4 ++-- .github/workflows/golangci-feature.yml | 2 +- .github/workflows/golangci.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 4 ++-- .github/workflows/wasm-client.yml | 6 +++--- Dockerfile | 2 +- e2e/go.mod | 2 +- go.mod | 2 +- go.work.example | 2 +- modules/apps/callbacks/Dockerfile | 2 +- modules/apps/callbacks/go.mod | 4 ++-- modules/capability/go.mod | 2 +- modules/light-clients/08-wasm/Dockerfile | 2 +- modules/light-clients/08-wasm/go.mod | 2 +- 22 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/callbacks.yml b/.github/workflows/callbacks.yml index d3b3d811df0..364fb6d1012 100644 --- a/.github/workflows/callbacks.yml +++ b/.github/workflows/callbacks.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v6.0.1 with: @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Build callbacks-module run: | cd modules/apps/callbacks @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Go Test run: | cd modules/apps/callbacks diff --git a/.github/workflows/capability.yml b/.github/workflows/capability.yml index 5eab860ff6d..7b039158bc4 100644 --- a/.github/workflows/capability.yml +++ b/.github/workflows/capability.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Build capability-module run: | cd modules/capability @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Go Test run: | cd modules/capability diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml index d506847daf0..e2d77461515 100644 --- a/.github/workflows/e2e-compatibility-workflow-call.yaml +++ b/.github/workflows/e2e-compatibility-workflow-call.yaml @@ -43,7 +43,7 @@ jobs: repository: cosmos/ibc-go - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Run e2e Test run: | cd e2e diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml index 32abca4fd86..795a3b72838 100644 --- a/.github/workflows/e2e-fork.yml +++ b/.github/workflows/e2e-fork.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - id: set-matrix run: | output=$(go run cmd/build_test_matrix/main.go) @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - id: set-matrix run: | output=$(go run cmd/build_test_matrix/main.go) @@ -68,7 +68,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Run e2e Test run: | cd e2e @@ -103,7 +103,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Run e2e Test run: | cd e2e diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml index 56af3346e0a..ec4b4f91ec1 100644 --- a/.github/workflows/e2e-test-workflow-call.yml +++ b/.github/workflows/e2e-test-workflow-call.yml @@ -200,7 +200,7 @@ jobs: repository: cosmos/ibc-go - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - id: set-matrix run: | output=$(go run cmd/build_test_matrix/main.go) @@ -238,7 +238,7 @@ jobs: repository: cosmos/ibc-go - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Run e2e Test id: e2e_test run: | diff --git a/.github/workflows/e2e-wasm.yaml b/.github/workflows/e2e-wasm.yaml index fd030761eae..f5f97440859 100644 --- a/.github/workflows/e2e-wasm.yaml +++ b/.github/workflows/e2e-wasm.yaml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - id: get-tag run: | if [ -z "${{ github.event.pull_request.number }}" ] diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 7bea58b5913..041dd04489c 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - id: get-tag run: | if [ -z "${{ github.event.pull_request.number }}" ] diff --git a/.github/workflows/e2emodule.yml b/.github/workflows/e2emodule.yml index 782de0bc1ab..a99a9d62df1 100644 --- a/.github/workflows/e2emodule.yml +++ b/.github/workflows/e2emodule.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v6.0.1 with: @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Go Test run: | cd e2e diff --git a/.github/workflows/golangci-feature.yml b/.github/workflows/golangci-feature.yml index ed629b6789c..18cf00f1761 100644 --- a/.github/workflows/golangci-feature.yml +++ b/.github/workflows/golangci-feature.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v6.0.1 diff --git a/.github/workflows/golangci.yml b/.github/workflows/golangci.yml index fb45c2b0fd6..367dba78283 100644 --- a/.github/workflows/golangci.yml +++ b/.github/workflows/golangci.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v6.0.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f311be1aaa..f2caa9e13b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Release uses: goreleaser/goreleaser-action@v5 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90c45ae731f..76fc89e36bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - uses: technote-space/get-diff-action@v6.1.2 id: git_diff with: @@ -88,7 +88,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - uses: technote-space/get-diff-action@v6.1.2 with: PATTERNS: | diff --git a/.github/workflows/wasm-client.yml b/.github/workflows/wasm-client.yml index ed99717889d..d0f75b0fb52 100644 --- a/.github/workflows/wasm-client.yml +++ b/.github/workflows/wasm-client.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v6.0.1 with: @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' # Install cross compiler for ARM64. Export CC env variable. - name: Install compiler for arm64. run: | @@ -50,7 +50,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Go Test run: | cd modules/light-clients/08-wasm diff --git a/Dockerfile b/Dockerfile index 74fd9af413a..c3bf9003ea8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine3.18 as builder +FROM golang:1.22-alpine3.20 as builder ARG IBC_GO_VERSION RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make; diff --git a/e2e/go.mod b/e2e/go.mod index ab314313867..e6e99d136db 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/cosmos/ibc-go/e2e -go 1.21 +go 1.22 replace github.com/strangelove-ventures/interchaintest/v8 => github.com/DimitrisJim/interchaintest/v8 v8.0.0-20240419095404-2c9270423b9a diff --git a/go.mod b/go.mod index 6b11d467b47..5191c5be653 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -go 1.21 +go 1.22 module github.com/cosmos/ibc-go/v8 diff --git a/go.work.example b/go.work.example index a9af0dd205d..ae5dd7327be 100644 --- a/go.work.example +++ b/go.work.example @@ -1,4 +1,4 @@ -go 1.21 +go 1.22 use ( ./ diff --git a/modules/apps/callbacks/Dockerfile b/modules/apps/callbacks/Dockerfile index 56149c49ae4..c209fa95ae1 100644 --- a/modules/apps/callbacks/Dockerfile +++ b/modules/apps/callbacks/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine3.18 as builder +FROM golang:1.22-alpine3.20 as builder RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make; diff --git a/modules/apps/callbacks/go.mod b/modules/apps/callbacks/go.mod index 98d9fe0d22b..0295936b2bb 100644 --- a/modules/apps/callbacks/go.mod +++ b/modules/apps/callbacks/go.mod @@ -1,8 +1,8 @@ module github.com/cosmos/ibc-go/modules/apps/callbacks -go 1.21 +go 1.22 -toolchain go1.21.0 +toolchain go1.22.0 replace github.com/cosmos/ibc-go/v8 => ../../../ diff --git a/modules/capability/go.mod b/modules/capability/go.mod index a66ed1f3b01..0ae19f6d735 100644 --- a/modules/capability/go.mod +++ b/modules/capability/go.mod @@ -1,6 +1,6 @@ module github.com/cosmos/ibc-go/modules/capability -go 1.21 +go 1.22 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/modules/light-clients/08-wasm/Dockerfile b/modules/light-clients/08-wasm/Dockerfile index b32b7242bc8..8e4bc8999a0 100644 --- a/modules/light-clients/08-wasm/Dockerfile +++ b/modules/light-clients/08-wasm/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine3.18 as builder +FROM golang:1.22-alpine3.20 as builder ARG LIBWASM_VERSION ARG LIBWASM_CHECKSUM diff --git a/modules/light-clients/08-wasm/go.mod b/modules/light-clients/08-wasm/go.mod index 1cbc808f7bb..69f694c0799 100644 --- a/modules/light-clients/08-wasm/go.mod +++ b/modules/light-clients/08-wasm/go.mod @@ -1,6 +1,6 @@ module github.com/cosmos/ibc-go/modules/light-clients/08-wasm -go 1.21 +go 1.22 replace github.com/cosmos/ibc-go/v8 => ../../../ From 99bd71cd725a98f71532d674ccbc53bd75862873 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Fri, 24 May 2024 13:23:01 +0200 Subject: [PATCH 2/4] update go.work.example --- go.work.example | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.work.example b/go.work.example index ae5dd7327be..0b98443c229 100644 --- a/go.work.example +++ b/go.work.example @@ -1,4 +1,6 @@ -go 1.22 +go 1.22.0 + +toolchain go1.22.0 use ( ./ From dc6224380c4388e8a89de581ce8f0b2ccafdcf9b Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Fri, 24 May 2024 13:23:26 +0200 Subject: [PATCH 3/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9299281e19..746abc2793a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [\#6193](https://github.com/cosmos/ibc-go/pull/6193) Bump Cosmos SDK to v0.50.6. * [\#6193](https://github.com/cosmos/ibc-go/pull/6193) Bump `cosmossdk.io/store` to v1.1.0. * [\#6239](https://github.com/cosmos/ibc-go/pull/6239) Bump CometBFT to v0.38.7. +* [\#6380](https://github.com/cosmos/ibc-go/pull/6380) Bump go to v1.22. ### API Breaking From 82fac2e0d30f42dc7a9cc4f3d4d66dac779fa5da Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Fri, 24 May 2024 13:48:14 +0200 Subject: [PATCH 4/4] maybe this fixes the error seen here https://github.com/cosmos/ibc-go/actions/runs/9223322569/job/25376281731?pr=6380 --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 613c65176c7..6015722f2f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,6 +55,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: '1.22' - name: Create a file with all the pkgs run: go list ./... | grep -v e2e > pkgs.txt - name: Split pkgs into 4 files