Revert go version change

smartcontractkit · Nov 23, 2023 · da4ed5f · da4ed5f
1 parent 22f75d1
commit da4ed5f
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ regarding Chainlink social accounts, news, and networking.
 
 ## Build Chainlink
 
-1. [Install Go 1.20.5](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.21.1](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 v16](https://nodejs.org/en/download/package-manager/) & [pnpm 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
@@ -1,5 +1,5 @@
 # Build image: Chainlink binary
-FROM golang:1.20.5-buster as buildgo
+FROM golang:1.21-bullseye as buildgo
 RUN go version
 WORKDIR /chainlink
 

diff --git a/core/chainlink.devspace.Dockerfile b/core/chainlink.devspace.Dockerfile
@@ -1,5 +1,5 @@
 # Build image: Chainlink binary
-FROM golang:1.20.5-buster as buildgo
+FROM golang:1.21-bullseye as buildgo
 RUN go version
 WORKDIR /chainlink
 
@@ -18,7 +18,7 @@ COPY . .
 RUN make install-chainlink
 
 # Final image: ubuntu with chainlink binary
-FROM golang:1.20.5-buster
+FROM golang:1.21-bullseye
 
 ARG CHAINLINK_USER=root
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/core/scripts
 
-go 1.20
+go 1.21
 
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../../

diff --git a/core/scripts/go.sum b/core/scripts/go.sum
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/v2
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Depado/ginprom v1.7.11

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/integration-tests
 
-go 1.20
+go 1.21
 
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../

diff --git a/integration-tests/testsetups/ocr.go b/integration-tests/testsetups/ocr.go
@@ -546,6 +546,7 @@ func (o *OCRSoakTest) setFilterQuery() {
 	o.filterQuery = geth.FilterQuery{
 		Addresses: ocrAddresses,
 		Topics:    [][]common.Hash{{contractABI.Events["AnswerUpdated"].ID}},
+		FromBlock: big.NewInt(0).SetUint64(o.startingBlockNum),
 	}
 	o.log.Debug().
 		Interface("Addresses", ocrAddresses).

diff --git a/plugins/chainlink.Dockerfile b/plugins/chainlink.Dockerfile
@@ -1,5 +1,5 @@
 # Build image: Chainlink binary
-FROM golang:1.20.5-buster as buildgo
+FROM golang:1.21-bullseye as buildgo
 RUN go version
 WORKDIR /chainlink
 

diff --git a/tools/docker/cldev.Dockerfile b/tools/docker/cldev.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.5-buster
+FROM golang:1.21-bullseye
 
 ARG SRCROOT=/usr/local/src/chainlink
 WORKDIR ${SRCROOT}