Skip to content

Commit a776fe4

Browse files
authored
Chore: use Go 1.24.6 build image (#6976)
* Chore: use Go 1.24.6 build image --------- Signed-off-by: Justin Holcomb <[email protected]> * Doc: update CHANGELOG with Go 1.24.6 enhancement --------- Signed-off-by: Justin Holcomb <[email protected]> --------- Signed-off-by: Justin Holcomb <[email protected]>
1 parent 59491e9 commit a776fe4

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

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

Lines changed: 7 additions & 7 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-7ce1d1b12
20+
image: quay.io/cortexproject/build-image:master-59491e9aae
2121
steps:
2222
- name: Checkout Repo
2323
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -46,7 +46,7 @@ jobs:
4646
test:
4747
runs-on: ubuntu-24.04
4848
container:
49-
image: quay.io/cortexproject/build-image:master-7ce1d1b12
49+
image: quay.io/cortexproject/build-image:master-59491e9aae
5050
steps:
5151
- name: Checkout Repo
5252
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -64,7 +64,7 @@ jobs:
6464
test-no-race:
6565
runs-on: ubuntu-24.04
6666
container:
67-
image: quay.io/cortexproject/build-image:master-7ce1d1b12
67+
image: quay.io/cortexproject/build-image:master-59491e9aae
6868
steps:
6969
- name: Checkout Repo
7070
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -107,7 +107,7 @@ jobs:
107107
build:
108108
runs-on: ubuntu-24.04
109109
container:
110-
image: quay.io/cortexproject/build-image:master-7ce1d1b12
110+
image: quay.io/cortexproject/build-image:master-59491e9aae
111111
steps:
112112
- name: Checkout Repo
113113
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -247,14 +247,14 @@ jobs:
247247
run: |
248248
touch build-image/.uptodate
249249
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
250-
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-7ce1d1b12 TTY='' configs-integration-test
250+
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-59491e9aae TTY='' configs-integration-test
251251
252252
deploy_website:
253253
needs: [build, test]
254254
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
255255
runs-on: ubuntu-24.04
256256
container:
257-
image: quay.io/cortexproject/build-image:master-7ce1d1b12
257+
image: quay.io/cortexproject/build-image:master-59491e9aae
258258
steps:
259259
- name: Checkout Repo
260260
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -296,7 +296,7 @@ jobs:
296296
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
297297
runs-on: ubuntu-24.04
298298
container:
299-
image: quay.io/cortexproject/build-image:master-7ce1d1b12
299+
image: quay.io/cortexproject/build-image:master-59491e9aae
300300
steps:
301301
- name: Checkout Repo
302302
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
* [ENHANCEMENT] Query Frontend: Add a `format_query` label value to the `op` label at `cortex_query_frontend_queries_total` metric. #6925
7272
* [ENHANCEMENT] API: add request ID injection to context to enable tracking requests across downstream services. #6895
7373
* [ENHANCEMENT] gRPC: Add gRPC Channelz monitoring. #6950
74+
* [ENHANCEMENT] Upgrade build image and Go version to 1.24.6. #6970 #6976
7475
* [BUGFIX] Ingester: Avoid error or early throttling when READONLY ingesters are present in the ring #6517
7576
* [BUGFIX] Ingester: Fix labelset data race condition. #6573
7677
* [BUGFIX] Compactor: Cleaner should not put deletion marker for blocks with no-compact marker. #6576

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-7ce1d1b12
115+
LATEST_BUILD_IMAGE_TAG ?= master-59491e9aae
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

0 commit comments

Comments
 (0)