From 1fe5a0bd23b39ad6b5b11b3000c34a5ad70f8be3 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Sat, 10 Feb 2024 17:11:28 +0100 Subject: [PATCH 1/3] ci: bump go to 1.22 --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependabot-update-all.yml | 2 +- .github/workflows/dependencies-review.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/release-confix.yml | 2 +- .github/workflows/release-cosmovisor.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sims-047.yml | 10 ++-- .github/workflows/sims-050.yml | 10 ++-- .github/workflows/sims-nightly.yml | 4 +- .github/workflows/sims.yml | 8 +-- .github/workflows/starship-tests.yml | 2 +- .github/workflows/test.yml | 60 ++++++++++----------- Dockerfile | 2 +- go.work.example | 4 +- simapp/go.mod | 2 +- tests/go.mod | 4 +- tests/starship/tests/go.mod | 4 +- 19 files changed, 65 insertions(+), 61 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f2e1f418f68..15b781c0f8d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@main - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: technote-space/get-diff-action@v6.1.2 id: git_diff diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index eb409afa0919..99717c3c79c5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependabot-update-all.yml b/.github/workflows/dependabot-update-all.yml index 40c2feb6f6b9..1b50b9ab5de6 100644 --- a/.github/workflows/dependabot-update-all.yml +++ b/.github/workflows/dependabot-update-all.yml @@ -17,7 +17,7 @@ jobs: token: ${{ secrets.PRBOT_PAT }} - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: Extract updated dependency id: deps diff --git a/.github/workflows/dependencies-review.yml b/.github/workflows/dependencies-review.yml index a89f93ff2ebf..5a08d1c6e0ec 100644 --- a/.github/workflows/dependencies-review.yml +++ b/.github/workflows/dependencies-review.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: "Dependency Review" uses: actions/dependency-review-action@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 674ffb9a0575..d27ffaf43a3c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,7 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@main - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: technote-space/get-diff-action@v6.1.2 id: git_diff diff --git a/.github/workflows/release-confix.yml b/.github/workflows/release-confix.yml index d284fd5551e0..2ea64f987853 100644 --- a/.github/workflows/release-confix.yml +++ b/.github/workflows/release-confix.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true # get 'v*.*.*' part from 'confix/v*.*.*' and save to $GITHUB_ENV - name: Set env diff --git a/.github/workflows/release-cosmovisor.yml b/.github/workflows/release-cosmovisor.yml index 38a58b4a7201..0256a4433e18 100644 --- a/.github/workflows/release-cosmovisor.yml +++ b/.github/workflows/release-cosmovisor.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true # get 'v*.*.*' part from 'cosmovisor/v*.*.*' and save to $GITHUB_ENV - name: Set env diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0d88133bd62..c8788df5d728 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: Unshallow run: git fetch --prune --unshallow diff --git a/.github/workflows/sims-047.yml b/.github/workflows/sims-047.yml index 8e9d86556ae9..865758ca5fee 100644 --- a/.github/workflows/sims-047.yml +++ b/.github/workflows/sims-047.yml @@ -21,7 +21,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - run: make build @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 @@ -52,7 +52,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: @@ -71,7 +71,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: @@ -90,7 +90,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: diff --git a/.github/workflows/sims-050.yml b/.github/workflows/sims-050.yml index 7e889c944139..128980fa228d 100644 --- a/.github/workflows/sims-050.yml +++ b/.github/workflows/sims-050.yml @@ -21,7 +21,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - run: make build @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 @@ -52,7 +52,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: @@ -71,7 +71,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: @@ -90,7 +90,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: diff --git a/.github/workflows/sims-nightly.yml b/.github/workflows/sims-nightly.yml index 6b4ef4f7aeeb..d93533016419 100644 --- a/.github/workflows/sims-nightly.yml +++ b/.github/workflows/sims-nightly.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml index 65595fa21096..d9192e16796e 100644 --- a/.github/workflows/sims.yml +++ b/.github/workflows/sims.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - run: make build - name: Install runsim @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: @@ -56,7 +56,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: @@ -74,7 +74,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - uses: actions/cache@v4 with: diff --git a/.github/workflows/starship-tests.yml b/.github/workflows/starship-tests.yml index 0f1b57a25b91..66b49754c3aa 100644 --- a/.github/workflows/starship-tests.yml +++ b/.github/workflows/starship-tests.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true # Starship Infra setup # - Connects to k8s cluster with kubeconfig (digital ocean) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0aa767ef7804..a379641c703c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: Create a file with all core Cosmos SDK pkgs run: go list ./... > pkgs.txt @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: go.sum @@ -88,7 +88,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: go.sum @@ -119,7 +119,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: go.sum @@ -197,7 +197,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: go.sum @@ -227,7 +227,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: go.sum @@ -260,7 +260,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: client/v2/go.sum @@ -413,7 +413,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: simapp/go.sum @@ -449,7 +449,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: collections/go.sum @@ -511,7 +511,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: tools/cosmovisor/go.sum @@ -542,7 +542,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: tools/confix/go.sum @@ -573,7 +573,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: tools/hubl/go.sum @@ -675,7 +675,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/accounts/go.sum @@ -706,7 +706,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/tx/go.sum @@ -737,7 +737,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/nft/go.sum @@ -768,7 +768,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/circuit/go.sum @@ -799,7 +799,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/distribution/go.sum @@ -830,7 +830,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/protocolpool/go.sum @@ -861,7 +861,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/feegrant/go.sum @@ -892,7 +892,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/evidence/go.sum @@ -922,7 +922,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/params/go.sum @@ -952,7 +952,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/upgrade/go.sum @@ -982,7 +982,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/group/go.sum @@ -1012,7 +1012,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/gov/go.sum @@ -1043,7 +1043,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/slashing/go.sum @@ -1074,7 +1074,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/staking/go.sum @@ -1105,7 +1105,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/auth/go.sum @@ -1136,7 +1136,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/authz/go.sum @@ -1167,7 +1167,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/bank/go.sum @@ -1198,7 +1198,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.22" check-latest: true cache: true cache-dependency-path: x/mint/go.sum diff --git a/Dockerfile b/Dockerfile index 1f03e2fbe97a..e88c194843c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # # This image is pushed to the GHCR as https://ghcr.io/cosmos/simapp -FROM golang:1.21-alpine AS build-env +FROM golang:1.22-alpine AS build-env # Install minimum necessary dependencies ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev diff --git a/go.work.example b/go.work.example index 49efc9086a9f..89c48b57cec8 100644 --- a/go.work.example +++ b/go.work.example @@ -1,6 +1,6 @@ -go 1.21 +go 1.22 -toolchain go1.21.0 +toolchain go1.22.0 use ( . diff --git a/simapp/go.mod b/simapp/go.mod index ddbe92288ae2..f14fc8852d97 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/simapp -go 1.21 +go 1.22 require ( cosmossdk.io/api v0.7.3-0.20231113122742-912390d5fc4a diff --git a/tests/go.mod b/tests/go.mod index d3c0dc7d976a..9b65ec1b4bb2 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,8 @@ module github.com/cosmos/cosmos-sdk/tests -go 1.21 +go 1.22 + +toolchain go1.22.0 require ( cosmossdk.io/api v0.7.3-0.20231113122742-912390d5fc4a diff --git a/tests/starship/tests/go.mod b/tests/starship/tests/go.mod index d9193281bcce..43885ef078cc 100644 --- a/tests/starship/tests/go.mod +++ b/tests/starship/tests/go.mod @@ -1,6 +1,8 @@ module github.com/cosmos-sdk/tests/starship/tests -go 1.21 +go 1.22 + +toolchain go1.22.0 replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 From 3b9f91266c4c3382cdec7426a3dd1626300846a9 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 12 Feb 2024 11:56:04 +0100 Subject: [PATCH 2/3] updates --- contrib/devtools/Dockerfile | 2 +- contrib/images/simd-dlv/Dockerfile | 2 +- contrib/images/simd-env/Dockerfile | 2 +- flake.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/devtools/Dockerfile b/contrib/devtools/Dockerfile index 1959385c89a0..7a4ec204a535 100644 --- a/contrib/devtools/Dockerfile +++ b/contrib/devtools/Dockerfile @@ -3,7 +3,7 @@ # docker run --rm -v $(pwd):/workspace --workdir /workspace cosmossdk-proto sh ./scripts/protocgen.sh FROM bufbuild/buf:1.24.0 as BUILDER -FROM golang:1.21-alpine +FROM golang:1.22-alpine RUN apk add --no-cache \ nodejs \ diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile index ab51e94543fc..35266f5f271a 100644 --- a/contrib/images/simd-dlv/Dockerfile +++ b/contrib/images/simd-dlv/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-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 diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index 32f112935acc..0abe69b069e8 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine AS build +FROM golang:1.22-alpine AS build RUN apk add build-base git linux-headers diff --git a/flake.nix b/flake.nix index 852838bd4587..6ce78209ce3d 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ default = simd; simd = with pkgs; mkShell { buildInputs = [ - go_1_21 # Use Go 1.21 version + go_1_22 # Use Go 1.22 version rocksdb ]; }; From 11119c8623c598102aa84c64a71069e190241664 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 23 Feb 2024 10:01:54 +0000 Subject: [PATCH 3/3] `nix --extra-experimental-features nix-command flake --extra-experimental-features flakes u pdate nixpkgs` --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 32be4e59d04e..add9e6fa014f 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692598785, - "narHash": "sha256-MqRfKtLdzpMNTxKuJxO66zmBs96XgV1W8wkQVzEl2KE=", + "lastModified": 1708682383, + "narHash": "sha256-w8zFWDDRKbf/9PDbkAXrEG+Ehb6K0f5utjfXfti/CHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c740ca0e9ba769b6932a3d58f68046dba4280cbb", + "rev": "f305ff3011bbbac55d894a865343a656fe77ee62", "type": "github" }, "original": {