From eb23315f9e5b9a461d4b3bdec954a4428bd81a99 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Fri, 11 Oct 2024 10:12:12 -0700 Subject: [PATCH 1/2] upgrade to go 1.23 Signed-off-by: Ben Ye --- .github/workflows/test-build-deploy.yml | 2 +- build-image/Dockerfile | 2 +- go.mod | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index 83e4a6cc113..ab2232595fe 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -148,7 +148,7 @@ jobs: - name: Upgrade golang uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2.2.0 with: - go-version: 1.22.5 + go-version: 1.23.2 - name: Checkout Repo uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Install Docker Client diff --git a/build-image/Dockerfile b/build-image/Dockerfile index c416ffae899..82bcf3f06a4 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7-bullseye +FROM golang:1.23.2-bullseye ARG goproxyValue ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \ diff --git a/go.mod b/go.mod index d5477040032..6c7651cb9f6 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/cortexproject/cortex -go 1.22.0 - -toolchain go1.22.5 +go 1.23.0 require ( github.com/Masterminds/squirrel v1.5.4 From aaf0796fb78239320cc15239431f9d821a9b7c32 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Fri, 11 Oct 2024 12:57:27 -0700 Subject: [PATCH 2/2] only change build image Signed-off-by: Ben Ye --- .github/workflows/test-build-deploy.yml | 2 +- go.mod | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index ab2232595fe..83e4a6cc113 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -148,7 +148,7 @@ jobs: - name: Upgrade golang uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2.2.0 with: - go-version: 1.23.2 + go-version: 1.22.5 - name: Checkout Repo uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Install Docker Client diff --git a/go.mod b/go.mod index 6c7651cb9f6..d5477040032 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/cortexproject/cortex -go 1.23.0 +go 1.22.0 + +toolchain go1.22.5 require ( github.com/Masterminds/squirrel v1.5.4