Skip to content

Commit 176df21

Browse files
authored
Upgrade golang version to 1.22.5 (#6072)
Signed-off-by: 🌲 Harry 🌊 John 🏔 <[email protected]>
1 parent e3f3ab7 commit 176df21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+10
-590
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-2866917df
20+
image: quay.io/cortexproject/build-image:master-779dcf4ba
2121
steps:
2222
- name: Checkout Repo
2323
uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
4646
test:
4747
runs-on: ubuntu-20.04
4848
container:
49-
image: quay.io/cortexproject/build-image:master-2866917df
49+
image: quay.io/cortexproject/build-image:master-779dcf4ba
5050
steps:
5151
- name: Checkout Repo
5252
uses: actions/checkout@v2
@@ -89,7 +89,7 @@ jobs:
8989
build:
9090
runs-on: ubuntu-20.04
9191
container:
92-
image: quay.io/cortexproject/build-image:master-2866917df
92+
image: quay.io/cortexproject/build-image:master-779dcf4ba
9393
steps:
9494
- name: Checkout Repo
9595
uses: actions/checkout@v2
@@ -148,7 +148,7 @@ jobs:
148148
- name: Upgrade golang
149149
uses: actions/setup-go@v2
150150
with:
151-
go-version: 1.21.11
151+
go-version: 1.22.5
152152
- name: Checkout Repo
153153
uses: actions/checkout@v2
154154
- name: Install Docker Client
@@ -223,14 +223,14 @@ jobs:
223223
run: |
224224
touch build-image/.uptodate
225225
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
226-
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-2866917df TTY='' configs-integration-test
226+
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-779dcf4ba TTY='' configs-integration-test
227227
228228
deploy_website:
229229
needs: [build, test]
230230
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
231231
runs-on: ubuntu-20.04
232232
container:
233-
image: quay.io/cortexproject/build-image:master-2866917df
233+
image: quay.io/cortexproject/build-image:master-779dcf4ba
234234
steps:
235235
- name: Checkout Repo
236236
uses: actions/checkout@v2
@@ -272,7 +272,7 @@ jobs:
272272
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
273273
runs-on: ubuntu-20.04
274274
container:
275-
image: quay.io/cortexproject/build-image:master-2866917df
275+
image: quay.io/cortexproject/build-image:master-779dcf4ba
276276
steps:
277277
- name: Checkout Repo
278278
uses: actions/checkout@v2

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* [ENHANCEMENT] Ingester: Add a new `limits_per_label_set` limit. This limit functions similarly to `max_series_per_metric`, but allowing users to define the maximum number of series per LabelSet. #5950 #5993
1919
* [ENHANCEMENT] Store Gateway: Log gRPC requests together with headers configured in `http_request_headers_to_log`. #5958
2020
* [ENHANCEMENT] Upgrade Alpine to 3.19. #6014
21-
* [ENHANCEMENT] Upgrade go to 1.21.11 #6014
21+
* [ENHANCEMENT] Upgrade go to 1.22.5 #6014 #6072
2222
* [ENHANCEMENT] Ingester: Add a new experimental `-ingester.labels-string-interning-enabled` flag to enable string interning for metrics labels. #6057
2323
* [ENHANCEMENT] Ingester: Add link to renew 10% of the ingesters tokens in the admin page. #6063
2424
* [BUGFIX] Configsdb: Fix endline issue in db password. #5920

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-2866917df
118+
LATEST_BUILD_IMAGE_TAG ?= master-779dcf4ba
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexproject/cortex
22

3-
go 1.21
3+
go 1.22
44

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

vendor/github.com/golang-migrate/migrate/v4/source/iofs/testdata/migrations/1_foobar.down.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/golang-migrate/migrate/v4/source/iofs/testdata/migrations/1_foobar.up.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/golang-migrate/migrate/v4/source/iofs/testdata/migrations/3_foobar.up.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/golang-migrate/migrate/v4/source/iofs/testdata/migrations/4_foobar.down.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/golang-migrate/migrate/v4/source/iofs/testdata/migrations/4_foobar.up.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/github.com/golang-migrate/migrate/v4/source/iofs/testdata/migrations/5_foobar.down.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)