Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: bump go 1.22 #6380

Merged
merged 6 commits into from
May 27, 2024
Merged

deps: bump go 1.22 #6380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
660c40f
deps: bump go 1.22
May 24, 2024
99bd71c
update go.work.example
May 24, 2024
dc62243
changelog
May 24, 2024
47284f9
Merge branch 'main' into bump-go-1.22
May 24, 2024
82fac2e
maybe this fixes the error seen here https://github.com/cosmos/ibc-go…
May 24, 2024
927ab14
Merge branch 'main' into bump-go-1.22
May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/callbacks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/capability.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-compatibility-workflow-call.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-fork.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-test-workflow-call.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-wasm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}" ]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}" ]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2emodule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-feature.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
id: git_diff
with:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -88,7 +91,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wasm-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand All @@ -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: |
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure the Go version update is documented in the changelog.

Please add an entry in the changelog under the "Dependencies" section to document the update of the Go version to 1.22 as part of this pull request.


### API Breaking

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

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

module github.com/cosmos/ibc-go/v8

Expand Down
4 changes: 3 additions & 1 deletion go.work.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
go 1.21
go 1.22.0

toolchain go1.22.0

use (
./
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/callbacks/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pin specific versions of packages in apk add to ensure reproducibility.

- RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make;
+ RUN set -eux; apk add --no-cache git=2.30.2-r0 libusb-dev=1.0.24-r1 linux-headers=5.10.41-r0 gcc=10.3.1_git20210424-r2 musl-dev=1.2.2-r3 make=4.3-r0;
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make;
RUN set -eux; apk add --no-cache git=2.30.2-r0 libusb-dev=1.0.24-r1 linux-headers=5.10.41-r0 gcc=10.3.1_git20210424-r2 musl-dev=1.2.2-r3 make=4.3-r0;

Expand Down
4 changes: 2 additions & 2 deletions modules/apps/callbacks/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any idea if this is needed? some files have it, some not 🤷

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably it's not. Since it was already there, I left it...


replace github.com/cosmos/ibc-go/v8 => ../../../

Expand Down
2 changes: 1 addition & 1 deletion modules/capability/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion modules/light-clients/08-wasm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/light-clients/08-wasm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 => ../../../

Expand Down
Loading