Skip to content

Commit ae5aab3

Browse files
committed
Update build-image in CI jobs to go 1.25
1 parent 6f342b9 commit ae5aab3

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
lint:
1818
runs-on: ubuntu-24.04
1919
container:
20-
image: quay.io/cortexproject/build-image:master-59491e9aae
20+
image: quay.io/cortexproject/build-image:master-6c61d75c37
2121
steps:
2222
- name: Checkout Repo
2323
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -48,7 +48,7 @@ jobs:
4848
test:
4949
runs-on: ubuntu-24.04
5050
container:
51-
image: quay.io/cortexproject/build-image:master-59491e9aae
51+
image: quay.io/cortexproject/build-image:master-6c61d75c37
5252
steps:
5353
- name: Checkout Repo
5454
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -66,7 +66,7 @@ jobs:
6666
test-no-race:
6767
runs-on: ubuntu-24.04
6868
container:
69-
image: quay.io/cortexproject/build-image:master-59491e9aae
69+
image: quay.io/cortexproject/build-image:master-6c61d75c37
7070
steps:
7171
- name: Checkout Repo
7272
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -109,7 +109,7 @@ jobs:
109109
build:
110110
runs-on: ubuntu-24.04
111111
container:
112-
image: quay.io/cortexproject/build-image:master-59491e9aae
112+
image: quay.io/cortexproject/build-image:master-6c61d75c37
113113
steps:
114114
- name: Checkout Repo
115115
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -210,7 +210,7 @@ jobs:
210210
- name: Upgrade golang
211211
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
212212
with:
213-
go-version: 1.24.0
213+
go-version: 1.25.5
214214
- name: Checkout Repo
215215
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
216216
- name: Install Docker Client
@@ -293,14 +293,14 @@ jobs:
293293
touch build-image/.uptodate
294294
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
295295
echo "Running configs integration tests on ${{ matrix.arch }}"
296-
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-59491e9aae TTY='' configs-integration-test
296+
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-6c61d75c37 TTY='' configs-integration-test
297297
298298
deploy_website:
299299
needs: [build, test]
300300
if: github.ref == 'refs/heads/master' && github.repository == 'cortexproject/cortex'
301301
runs-on: ubuntu-24.04
302302
container:
303-
image: quay.io/cortexproject/build-image:master-59491e9aae
303+
image: quay.io/cortexproject/build-image:master-6c61d75c37
304304
steps:
305305
- name: Checkout Repo
306306
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -342,7 +342,7 @@ jobs:
342342
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
343343
runs-on: ubuntu-24.04
344344
container:
345-
image: quay.io/cortexproject/build-image:master-59491e9aae
345+
image: quay.io/cortexproject/build-image:master-6c61d75c37
346346
steps:
347347
- name: Checkout Repo
348348
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ build-image/$(UPTODATE): build-image/*
112112
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
113113
BUILD_IN_CONTAINER := true
114114
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
115-
LATEST_BUILD_IMAGE_TAG ?= master-59491e9aae
115+
LATEST_BUILD_IMAGE_TAG ?= master-6c61d75c37
116116

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

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexproject/cortex
22

3-
go 1.24.0
3+
go 1.25.5
44

55
require (
66
github.com/Masterminds/squirrel v1.5.4

0 commit comments

Comments
 (0)