From fd9c7a3cff03c83533b38774db9371f51454e80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deividas=20Kar=C5=BEinauskas?= Date: Thu, 11 Jul 2024 17:36:35 +0300 Subject: [PATCH] Go: 1.21.7 => 1.22.5 (#13820) * Go: 1.21.7 => 1.22.5 * Update chainlink dockerfile * Update dockerfiles * Add changeset * Update readme --- .changeset/many-kids-shave.md | 5 +++++ .tool-versions | 2 +- README.md | 2 +- core/chainlink.Dockerfile | 4 ++-- core/scripts/go.mod | 4 +--- dashboard-lib/go.mod | 2 +- go.mod | 2 +- integration-tests/.tool-versions | 2 +- integration-tests/go.mod | 2 +- integration-tests/load/go.mod | 2 +- plugins/chainlink.Dockerfile | 4 ++-- 11 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 .changeset/many-kids-shave.md diff --git a/.changeset/many-kids-shave.md b/.changeset/many-kids-shave.md new file mode 100644 index 00000000000..5c3c83bad99 --- /dev/null +++ b/.changeset/many-kids-shave.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +Go: 1.21.7 => 1.22.5 diff --git a/.tool-versions b/.tool-versions index f660f2ac116..7d237b0a4a1 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -golang 1.21.7 +golang 1.22.5 mockery 2.43.2 nodejs 20.13.1 pnpm 9.4.0 diff --git a/README.md b/README.md index a62be57a6ea..41f3a5b0b35 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ regarding Chainlink social accounts, news, and networking. ## Build Chainlink -1. [Install Go 1.21](https://golang.org/doc/install), and add your GOPATH's [bin directory to your PATH](https://golang.org/doc/code.html#GOPATH) +1. [Install Go 1.22](https://golang.org/doc/install), and add your GOPATH's [bin directory to your PATH](https://golang.org/doc/code.html#GOPATH) - Example Path for macOS `export PATH=$GOPATH/bin:$PATH` & `export GOPATH=/Users/$USER/go` 2. Install [NodeJS v20](https://nodejs.org/en/download/package-manager/) & [pnpm v9 via npm](https://pnpm.io/installation#using-npm). - It might be easier long term to use [nvm](https://nodejs.org/en/download/package-manager/#nvm) to switch between node versions for different projects. For example, assuming $NODE_VERSION was set to a valid version of NodeJS, you could run: `nvm install $NODE_VERSION && nvm use $NODE_VERSION` diff --git a/core/chainlink.Dockerfile b/core/chainlink.Dockerfile index 48f6da73612..753172a1a9f 100644 --- a/core/chainlink.Dockerfile +++ b/core/chainlink.Dockerfile @@ -1,5 +1,5 @@ # Build image: Chainlink binary -FROM golang:1.21-bullseye as buildgo +FROM golang:1.22-bullseye as buildgo RUN go version WORKDIR /chainlink @@ -31,7 +31,7 @@ RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds | xargs RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana | xargs -I % ln -s % /chainlink-solana # Build image: Plugins -FROM golang:1.21-bullseye as buildplugins +FROM golang:1.22-bullseye as buildplugins RUN go version WORKDIR /chainlink-feeds diff --git a/core/scripts/go.mod b/core/scripts/go.mod index e735959f4e6..99d8e93014f 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -1,8 +1,6 @@ module github.com/smartcontractkit/chainlink/core/scripts -go 1.22.0 - -toolchain go1.22.3 +go 1.22.5 // Make sure we're working with the latest chainlink libs replace github.com/smartcontractkit/chainlink/v2 => ../../ diff --git a/dashboard-lib/go.mod b/dashboard-lib/go.mod index ecb33bbae30..10270853ed1 100644 --- a/dashboard-lib/go.mod +++ b/dashboard-lib/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/dashboard-lib -go 1.21.7 +go 1.22.5 require ( github.com/K-Phoen/grabana v0.22.1 diff --git a/go.mod b/go.mod index 30fe2b5e5e2..7bee75295b7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/v2 -go 1.21.7 +go 1.22.5 require ( github.com/Depado/ginprom v1.8.0 diff --git a/integration-tests/.tool-versions b/integration-tests/.tool-versions index 7b9e8ab6bf4..d623afb2832 100644 --- a/integration-tests/.tool-versions +++ b/integration-tests/.tool-versions @@ -1,4 +1,4 @@ -golang 1.21.7 +golang 1.22.5 k3d 5.4.6 kubectl 1.25.5 nodejs 20.13.1 diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 764f41ed765..977aad987b3 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/integration-tests -go 1.21.7 +go 1.22.5 // Make sure we're working with the latest chainlink libs replace github.com/smartcontractkit/chainlink/v2 => ../ diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 2d1c6d5d12d..5096e2cf24b 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/load-tests -go 1.21.7 +go 1.22.5 // Make sure we're working with the latest chainlink libs replace github.com/smartcontractkit/chainlink/v2 => ../../ diff --git a/plugins/chainlink.Dockerfile b/plugins/chainlink.Dockerfile index 50986396296..6d42567c745 100644 --- a/plugins/chainlink.Dockerfile +++ b/plugins/chainlink.Dockerfile @@ -1,5 +1,5 @@ # Build image: Chainlink binary -FROM golang:1.21-bullseye as buildgo +FROM golang:1.22-bullseye as buildgo RUN go version WORKDIR /chainlink @@ -33,7 +33,7 @@ RUN mkdir /chainlink-starknet RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-starknet/relayer | xargs -I % ln -s % /chainlink-starknet/relayer # Build image: Plugins -FROM golang:1.21-bullseye as buildplugins +FROM golang:1.22-bullseye as buildplugins RUN go version WORKDIR /chainlink-feeds