Skip to content

Commit

Permalink
Revert go version change
Browse files Browse the repository at this point in the history
  • Loading branch information
davidcauchi committed Dec 5, 2023
1 parent 7c85b02 commit 1f37945
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion core/chainlink.Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions core/chainlink.devspace.Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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=chainlink
ENV DEBIAN_FRONTEND noninteractive
Expand Down
67 changes: 67 additions & 0 deletions core/scripts/go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions integration-tests/testsetups/ocr.go
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion plugins/chainlink.Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/cldev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.5-buster
FROM golang:1.21-bullseye

ARG SRCROOT=/usr/local/src/chainlink
WORKDIR ${SRCROOT}
Expand Down

0 comments on commit 1f37945

Please sign in to comment.