From 3ad2b1a8d1dd353f92dc926cc7657740be0cd745 Mon Sep 17 00:00:00 2001 From: ptrus Date: Wed, 6 Mar 2024 11:01:50 +0100 Subject: [PATCH] go: Update go to 1.22.1 --- .changelog/5586.feature.md | 1 + .github/workflows/ci-lint.yml | 2 +- .github/workflows/ci-reproducibility.yml | 2 +- .github/workflows/release-dev.yml | 2 +- .github/workflows/release.yml | 2 +- docker/oasis-core-dev/Dockerfile | 2 +- docs/development-setup/prerequisites.md | 10 +++++----- go/go.mod | 2 +- tests/upgrade/post/go.mod | 4 +--- 9 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 .changelog/5586.feature.md diff --git a/.changelog/5586.feature.md b/.changelog/5586.feature.md new file mode 100644 index 00000000000..a8d1ef8bb61 --- /dev/null +++ b/.changelog/5586.feature.md @@ -0,0 +1 @@ +go: Update go to 1.22.1 diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index 7af8e129167..b068cc7e06c 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -46,7 +46,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22.x" + go-version: "1.22.1" - name: Set up Rust run: rustup show - name: Install dependencies diff --git a/.github/workflows/ci-reproducibility.yml b/.github/workflows/ci-reproducibility.yml index f2b139d0ecd..ef87d951e47 100644 --- a/.github/workflows/ci-reproducibility.yml +++ b/.github/workflows/ci-reproducibility.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22.x" + go-version: "1.22.1" - name: Set up Rust working-directory: build${{ matrix.build_number }} run: rustup show diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index 08cf63cce7b..51fccbae238 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -35,7 +35,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22.x" + go-version: "1.22.1" - name: Set up Rust run: rustup show - name: Install Oasis Node prerequisites diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e19c1ba1cb7..b7df0f87d9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22.x" + go-version: "1.22.1" - name: Set up Rust run: rustup show diff --git a/docker/oasis-core-dev/Dockerfile b/docker/oasis-core-dev/Dockerfile index 0645808237e..f081d139b1a 100644 --- a/docker/oasis-core-dev/Dockerfile +++ b/docker/oasis-core-dev/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 # Package versions. -ARG GO_VERSION=1.22.0 +ARG GO_VERSION=1.22.1 ARG GO_NANCY_VERSION=1.0.33 ARG GO_NANCY_CHECKSUM=a4bf5290d41b095c04f941ed5380674770c79d59735e33b1bd07a5cd5fbb135d ARG GO_PROTOC_VERSION=3.6.1 diff --git a/docs/development-setup/prerequisites.md b/docs/development-setup/prerequisites.md index 6ae8383f295..3fad57348a0 100644 --- a/docs/development-setup/prerequisites.md +++ b/docs/development-setup/prerequisites.md @@ -40,7 +40,7 @@ Core: ``` -* [Go] (at least version 1.22.0). +* [Go] (at least version 1.22.1). If your distribution provides a new-enough version of Go, just use that. @@ -52,18 +52,18 @@ Core: * [ensure `$GOPATH/bin` is in your `PATH`]( https://tip.golang.org/doc/code.html#GOPATH), * [install the desired version of Go]( - https://golang.org/doc/install#extra_versions), e.g. 1.22.0, with: + https://golang.org/doc/install#extra_versions), e.g. 1.22.1, with: ``` - go install golang.org/dl/go1.22.0@latest - go1.22.0 download + go install golang.org/dl/go1.22.1@latest + go1.22.1 download ``` * instruct the build system to use this particular version of Go by setting the `OASIS_GO` environment variable in your `~/.bashrc`: ``` - export OASIS_GO=go1.22.0 + export OASIS_GO=go1.22.1 ``` * [Rust]. diff --git a/go/go.mod b/go/go.mod index cfeecdc921c..6301a4e7e78 100644 --- a/go/go.mod +++ b/go/go.mod @@ -193,4 +193,4 @@ require ( lukechampine.com/blake3 v1.2.1 // indirect ) -go 1.22 +go 1.22.1 diff --git a/tests/upgrade/post/go.mod b/tests/upgrade/post/go.mod index 4e0d810b950..4a9ee4c6c6d 100644 --- a/tests/upgrade/post/go.mod +++ b/tests/upgrade/post/go.mod @@ -1,8 +1,6 @@ module github.com/oasisprotocol/oasis-core/test-upgrade -go 1.22 - -toolchain go1.22.0 +go 1.22.1 replace ( github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.2-oasis1