Skip to content

Commit abc674a

Browse files
friedrichgyeya24
authored andcommitted
Upgrade to go 1.21.9 (cortexproject#5879)
* Upgrade to go 1.21.9 Signed-off-by: Friedrich Gonzalez <[email protected]> * Update changelog and workflows Signed-off-by: Friedrich Gonzalez <[email protected]> * Not use minor version for now. Needs more investigation Signed-off-by: Friedrich Gonzalez <[email protected]> * Update image again Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: Friedrich Gonzalez <[email protected]>
1 parent b9a07eb commit abc674a

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/test-build-deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
lint:
1212
runs-on: ubuntu-20.04
1313
container:
14-
image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
14+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
1515
steps:
1616
- name: Checkout Repo
1717
uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
4040
test:
4141
runs-on: ubuntu-20.04
4242
container:
43-
image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
43+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
4444
steps:
4545
- name: Checkout Repo
4646
uses: actions/checkout@v2
@@ -59,7 +59,7 @@ jobs:
5959
build:
6060
runs-on: ubuntu-20.04
6161
container:
62-
image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
62+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
6363
steps:
6464
- name: Checkout Repo
6565
uses: actions/checkout@v2
@@ -193,14 +193,14 @@ jobs:
193193
run: |
194194
touch build-image/.uptodate
195195
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
196-
make BUILD_IMAGE=quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50 TTY='' configs-integration-test
196+
make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 TTY='' configs-integration-test
197197
198198
deploy_website:
199199
needs: [build, test]
200200
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
201201
runs-on: ubuntu-20.04
202202
container:
203-
image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
203+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
204204
steps:
205205
- name: Checkout Repo
206206
uses: actions/checkout@v2
@@ -242,7 +242,7 @@ jobs:
242242
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
243243
runs-on: ubuntu-20.04
244244
container:
245-
image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
245+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
246246
steps:
247247
- name: Checkout Repo
248248
uses: actions/checkout@v2

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
## 1.16.1 2024-04-23
66

77
* [ENHANCEMENT] Upgraded Docker base images to `alpine:3.18`. #5684
8+
* [ENHANCEMENT] Upgrade to go 1.21.9 #5879
89

910
## 1.16.0 2023-11-20
1011

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ build-image/$(UPTODATE): build-image/*
122122
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
123123
BUILD_IN_CONTAINER := true
124124
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
125-
LATEST_BUILD_IMAGE_TAG ?= update-go-1.21.3-e38685e50
125+
LATEST_BUILD_IMAGE_TAG ?= upgrade-go-to-1.21.9-b37062f16
126126

127127
# TTY is parameterized to allow Google Cloud Builder to run builds,
128128
# as it currently disallows TTY devices. This value needs to be overridden

build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21.3-bullseye
1+
FROM golang:1.21.9-bullseye
22
ARG goproxyValue
33
ENV GOPROXY=${goproxyValue}
44
RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \

0 commit comments

Comments
 (0)