Skip to content

Commit 1fb4cc1

Browse files
authored
upgrade go version to 1.23.2 and update build image (#6262)
1 parent ac7827f commit 1fb4cc1

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
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-20.04
1919
container:
20-
image: quay.io/cortexproject/build-image:master-582c03a76
20+
image: quay.io/cortexproject/build-image:master-ac7827fa9
2121
steps:
2222
- name: Checkout Repo
2323
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
@@ -46,7 +46,7 @@ jobs:
4646
test:
4747
runs-on: ubuntu-20.04
4848
container:
49-
image: quay.io/cortexproject/build-image:master-582c03a76
49+
image: quay.io/cortexproject/build-image:master-ac7827fa9
5050
steps:
5151
- name: Checkout Repo
5252
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
@@ -89,7 +89,7 @@ jobs:
8989
build:
9090
runs-on: ubuntu-20.04
9191
container:
92-
image: quay.io/cortexproject/build-image:master-582c03a76
92+
image: quay.io/cortexproject/build-image:master-ac7827fa9
9393
steps:
9494
- name: Checkout Repo
9595
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
@@ -148,7 +148,7 @@ jobs:
148148
- name: Upgrade golang
149149
uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2.2.0
150150
with:
151-
go-version: 1.22.5
151+
go-version: 1.23.2
152152
- name: Checkout Repo
153153
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
154154
- name: Install Docker Client
@@ -224,14 +224,14 @@ jobs:
224224
run: |
225225
touch build-image/.uptodate
226226
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
227-
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-582c03a76 TTY='' configs-integration-test
227+
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-ac7827fa9 TTY='' configs-integration-test
228228
229229
deploy_website:
230230
needs: [build, test]
231231
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
232232
runs-on: ubuntu-20.04
233233
container:
234-
image: quay.io/cortexproject/build-image:master-582c03a76
234+
image: quay.io/cortexproject/build-image:master-ac7827fa9
235235
steps:
236236
- name: Checkout Repo
237237
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
@@ -273,7 +273,7 @@ jobs:
273273
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
274274
runs-on: ubuntu-20.04
275275
container:
276-
image: quay.io/cortexproject/build-image:master-582c03a76
276+
image: quay.io/cortexproject/build-image:master-ac7827fa9
277277
steps:
278278
- name: Checkout Repo
279279
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0

.golangci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ linters-settings:
2121
local-prefixes: "github.com/cortexproject/cortex"
2222
revive:
2323
severity: error # We only want critical issues.
24+
govet:
25+
disable:
26+
- printf
2427

2528
depguard:
2629
rules:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* [ENHANCEMENT] StoreGateway: Implement metadata API limit in queryable. #6195
2020
* [ENHANCEMENT] Ingester: Add matchers to ingester LabelNames() and LabelNamesStream() RPC. #6209
2121
* [ENHANCEMENT] Ingester/Store Gateway Clients: Introduce an experimental HealthCheck handler to quickly fail requests directed to unhealthy targets. #6225 #6257
22+
* [ENHANCEMENT] Upgrade build image and Go version to 1.23.2. #6261 #6262
2223
* [BUGFIX] Runtime-config: Handle absolute file paths when working directory is not / #6224
2324

2425
## 1.18.0 2024-09-03

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ build-image/$(UPTODATE): build-image/*
115115
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
116116
BUILD_IN_CONTAINER := true
117117
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
118-
LATEST_BUILD_IMAGE_TAG ?= master-582c03a76
118+
LATEST_BUILD_IMAGE_TAG ?= master-ac7827fa9
119119

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

go.mod

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

3-
go 1.22.0
4-
5-
toolchain go1.22.5
3+
go 1.23.0
64

75
require (
86
github.com/Masterminds/squirrel v1.5.4

pkg/ring/kv/dynamodb/dynamodb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func (kv dynamodbKV) Batch(ctx context.Context, put map[dynamodbKey][]byte, dele
237237
totalCapacity += getCapacityUnits(consumedCapacity)
238238
}
239239

240-
if resp.UnprocessedItems != nil && len(resp.UnprocessedItems) > 0 {
240+
if len(resp.UnprocessedItems) > 0 {
241241
return totalCapacity, fmt.Errorf("error processing batch request for %s requests", resp.UnprocessedItems)
242242
}
243243
}

0 commit comments

Comments
 (0)