From 56e8b79c3ed3c663ba91d33217642fac3b886a75 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 6 Jan 2022 09:26:33 +0100 Subject: [PATCH 1/2] Upgrade Go to 1.17.5 for integration tests Signed-off-by: Arve Knudsen --- .github/workflows/test-build-deploy.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index ebb28b4931..6f03b73122 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -96,13 +96,9 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Upgrade golang - run: | - cd /tmp - wget https://dl.google.com/go/go1.16.6.linux-amd64.tar.gz - tar -zxvf go1.16.6.linux-amd64.tar.gz - sudo rm -fr /usr/local/go - sudo mv /tmp/go /usr/local/go - cd - + uses: actions/setup-go@v2 + with: + go-version: 1.17.5 - name: Checkout Repo uses: actions/checkout@v2 - name: Install Docker Client From e257395b98885cb269326a92bf8b91433ec352f5 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 6 Jan 2022 12:58:46 +0100 Subject: [PATCH 2/2] Upgrade to Go 1.17 in Dockerfiles Signed-off-by: Arve Knudsen --- build-image/Dockerfile | 2 +- development/tsdb-blocks-storage-s3-gossip/dev.dockerfile | 2 +- development/tsdb-blocks-storage-s3/dev.dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index f229886d43..a7c71b746b 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.6-buster +FROM golang:1.17.5-buster ARG goproxyValue ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \ diff --git a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile index 6e2fdd78f3..e48c60c686 100644 --- a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 ENV CGO_ENABLED=0 RUN go get github.com/go-delve/delve/cmd/dlv diff --git a/development/tsdb-blocks-storage-s3/dev.dockerfile b/development/tsdb-blocks-storage-s3/dev.dockerfile index 6e2fdd78f3..e48c60c686 100644 --- a/development/tsdb-blocks-storage-s3/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3/dev.dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 ENV CGO_ENABLED=0 RUN go get github.com/go-delve/delve/cmd/dlv