Merge pull request #5586 from oasisprotocol/ptrus/feature/go-1.22.1

go: Bump go to 1.22.1
oasisprotocol · Mar 6, 2024 · dc8256d · dc8256d
2 parents 42fc283 + 3ad2b1a
commit dc8256d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 14 deletions.
diff --git a/.changelog/5586.feature.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,7 @@ Core:
   ```
   <!-- markdownlint-enable line-length -->
 
-* [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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -193,4 +193,4 @@ require ( @@
     	lukechampine.com/blake3 v1.2.1 // indirect
     )
-    go 1.22
+    go 1.22.1