From 2d16140d6a46189e7488d04f92fc592730a9e7a3 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Tue, 9 Aug 2022 15:50:16 -0700 Subject: [PATCH] ops: update ci-builder geth to v1.10.21 go to 1.19 golangci-lint to 1.48.0 --- .changeset/silent-comics-flash.md | 5 +++++ ops/docker/ci-builder/Dockerfile | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changeset/silent-comics-flash.md diff --git a/.changeset/silent-comics-flash.md b/.changeset/silent-comics-flash.md new file mode 100644 index 0000000000000..cfed02633d435 --- /dev/null +++ b/.changeset/silent-comics-flash.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/ci-builder': patch +--- + +Update golang, geth and golangci-lint diff --git a/ops/docker/ci-builder/Dockerfile b/ops/docker/ci-builder/Dockerfile index f2bec8f43fefa..7ef0b728d6a33 100644 --- a/ops/docker/ci-builder/Dockerfile +++ b/ops/docker/ci-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:alltools-v1.10.17 as geth +FROM ethereum/client-go:alltools-v1.10.21 as geth FROM ethereumoptimism/foundry:latest as foundry @@ -15,8 +15,8 @@ COPY check-changed.sh /usr/local/bin/check-changed RUN apt-get update && \ apt-get install -y bash curl openssh-client git build-essential ca-certificates jq musl && \ curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh && \ - curl -sL https://go.dev/dl/go1.18.2.linux-amd64.tar.gz -o go1.18.2.linux-amd64.tar.gz && \ - tar -C /usr/local/ -xzvf go1.18.2.linux-amd64.tar.gz && \ + curl -sL https://go.dev/dl/go1.19.linux-amd64.tar.gz -o go1.19.linux-amd64.tar.gz && \ + tar -C /usr/local/ -xzvf go1.19.linux-amd64.tar.gz && \ ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt && \ bash nodesource_setup.sh && \ apt-get install -y nodejs && \ @@ -24,7 +24,7 @@ RUN apt-get update && \ npm i -g depcheck && \ pip install slither-analyzer && \ go install gotest.tools/gotestsum@latest && \ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2 && \ + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0 && \ curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh | bash && \ chmod +x /usr/local/bin/check-changed