root
/
prometheus
mirror of https://github.com/prometheus/prometheus.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #17080 from Duciwuci/bump-go-ci 

chore: Bump Go min version to 1.24
This commit is contained in:
Ayoub Mrini 2025-09-09 14:31:18 +02:00 committed by GitHub
parent 0fc2547740 76a0cce3ac
commit 6a5abd6b4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/ci.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
container: container:
# Whenever the Go version is updated here, .promu.yml # Whenever the Go version is updated here, .promu.yml
# should also be updated. # should also be updated.
image: quay.io/prometheus/golang-builder:1.24-base image: quay.io/prometheus/golang-builder:1.25-base
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with: with:
@ -32,7 +32,7 @@ jobs:
name: More Go tests name: More Go tests
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: quay.io/prometheus/golang-builder:1.24-base image: quay.io/prometheus/golang-builder:1.25-base
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with: with:
@ -55,7 +55,7 @@ jobs:
GOTOOLCHAIN: local GOTOOLCHAIN: local
container: container:
# The go version in this image should be N-1 wrt test_go. # The go version in this image should be N-1 wrt test_go.
image: quay.io/prometheus/golang-builder:1.23-base image: quay.io/prometheus/golang-builder:1.24-base
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with: with:
@ -70,7 +70,7 @@ jobs:
# Whenever the Go version is updated here, .promu.yml # Whenever the Go version is updated here, .promu.yml
# should also be updated. # should also be updated.
container: container:
image: quay.io/prometheus/golang-builder:1.24-base image: quay.io/prometheus/golang-builder:1.25-base
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@ -97,7 +97,7 @@ jobs:
persist-credentials: false persist-credentials: false
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with: with:
go-version: 1.24.x go-version: 1.25.x
- run: | - run: |
$TestTargets = go list ./... | Where-Object { $_ -NotMatch "(github.com/prometheus/prometheus/config|github.com/prometheus/prometheus/web)"} $TestTargets = go list ./... | Where-Object { $_ -NotMatch "(github.com/prometheus/prometheus/config|github.com/prometheus/prometheus/web)"}
go test $TestTargets -vet=off -v go test $TestTargets -vet=off -v
@ -109,7 +109,7 @@ jobs:
# Whenever the Go version is updated here, .promu.yml # Whenever the Go version is updated here, .promu.yml
# should also be updated. # should also be updated.
container: container:
image: quay.io/prometheus/golang-builder:1.24-base image: quay.io/prometheus/golang-builder:1.25-base
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with: with:
@ -208,7 +208,7 @@ jobs:
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with: with:
cache: false cache: false
go-version: 1.24.x go-version: 1.25.x
- name: Run goyacc and check for diff - name: Run goyacc and check for diff
run: make install-goyacc check-generated-parser run: make install-goyacc check-generated-parser
golangci: golangci:
@ -222,7 +222,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with: with:
go-version: 1.24.x go-version: 1.25.x
- name: Install snmp_exporter/generator dependencies - name: Install snmp_exporter/generator dependencies
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
if: github.repository == 'prometheus/snmp_exporter' if: github.repository == 'prometheus/snmp_exporter'

2
.promu.yml
View File

@ -1,7 +1,7 @@
go: go:
# Whenever the Go version is updated here, # Whenever the Go version is updated here,
# .github/workflows should also be updated. # .github/workflows should also be updated.
version: 1.24 version: 1.25
repository: repository:
path: github.com/prometheus/prometheus path: github.com/prometheus/prometheus
build: build:

4
cmd/promtool/main_test.go
View File

@ -298,7 +298,7 @@ func TestCheckConfigSyntax(t *testing.T) {
err: "error checking client cert file \"testdata/nonexistent_cert_file.yml\": " + err: "error checking client cert file \"testdata/nonexistent_cert_file.yml\": " +
"stat testdata/nonexistent_cert_file.yml: no such file or directory", "stat testdata/nonexistent_cert_file.yml: no such file or directory",
errWindows: "error checking client cert file \"testdata\\\\nonexistent_cert_file.yml\": " + errWindows: "error checking client cert file \"testdata\\\\nonexistent_cert_file.yml\": " +
"CreateFile testdata\\nonexistent_cert_file.yml: The system cannot find the file specified.", "GetFileAttributesEx testdata\\nonexistent_cert_file.yml: The system cannot find the file specified.",
}, },
{ {
name: "check with syntax only succeeds with nonexistent credentials file", name: "check with syntax only succeeds with nonexistent credentials file",
@ -314,7 +314,7 @@ func TestCheckConfigSyntax(t *testing.T) {
err: "error checking authorization credentials or bearer token file \"/random/file/which/does/not/exist.yml\": " + err: "error checking authorization credentials or bearer token file \"/random/file/which/does/not/exist.yml\": " +
"stat /random/file/which/does/not/exist.yml: no such file or directory", "stat /random/file/which/does/not/exist.yml: no such file or directory",
errWindows: "error checking authorization credentials or bearer token file \"testdata\\\\random\\\\file\\\\which\\\\does\\\\not\\\\exist.yml\": " + errWindows: "error checking authorization credentials or bearer token file \"testdata\\\\random\\\\file\\\\which\\\\does\\\\not\\\\exist.yml\": " +
"CreateFile testdata\\random\\file\\which\\does\\not\\exist.yml: The system cannot find the path specified.", "GetFileAttributesEx testdata\\random\\file\\which\\does\\not\\exist.yml: The system cannot find the path specified.",
}, },
} }
for _, test := range cases { for _, test := range cases {

2
documentation/examples/remote_storage/go.mod
View File

@ -1,6 +1,6 @@
module github.com/prometheus/prometheus/documentation/examples/remote_storage module github.com/prometheus/prometheus/documentation/examples/remote_storage
go 1.23.0 go 1.24.0
require ( require (
github.com/alecthomas/kingpin/v2 v2.4.0 github.com/alecthomas/kingpin/v2 v2.4.0

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/prometheus/prometheus module github.com/prometheus/prometheus
go 1.23.0 go 1.24.0
require ( require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0

2
internal/tools/go.mod
View File

@ -1,6 +1,6 @@
module github.com/prometheus/prometheus/internal/tools module github.com/prometheus/prometheus/internal/tools
go 1.23.0 go 1.24.0
require ( require (
github.com/bufbuild/buf v1.51.0 github.com/bufbuild/buf v1.51.0

2
scripts/bump_go_version.sh
View File

@ -19,6 +19,8 @@ printf "Current minimum supported version: ${CURRENT_VERSION}\nNew minimum suppo
# Update go.mod files # Update go.mod files
go mod edit -go=${NEW_VERSION}.0 go mod edit -go=${NEW_VERSION}.0
go mod edit -go=${NEW_VERSION}.0 documentation/examples/remote_storage/go.mod go mod edit -go=${NEW_VERSION}.0 documentation/examples/remote_storage/go.mod
go mod edit -go=${NEW_VERSION}.0 web/ui/mantine-ui/src/promql/tools/go.mod
go mod edit -go=${NEW_VERSION}.0 internal/tools/go.mod
# Update .promu.yml # Update .promu.yml
sed -i "s/version: ${NEW_VERSION}/version: ${LATEST_VERSION}/g" .promu.yml sed -i "s/version: ${NEW_VERSION}/version: ${LATEST_VERSION}/g" .promu.yml

2
scripts/golangci-lint.yml
View File

@ -30,7 +30,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with: with:
go-version: 1.24.x go-version: 1.25.x
- name: Install snmp_exporter/generator dependencies - name: Install snmp_exporter/generator dependencies
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
if: github.repository == 'prometheus/snmp_exporter' if: github.repository == 'prometheus/snmp_exporter'

2
web/ui/mantine-ui/src/promql/tools/go.mod
View File

@ -1,6 +1,6 @@
module github.com/prometheus/prometheus/web/ui/mantine-ui/src/promql/tools module github.com/prometheus/prometheus/web/ui/mantine-ui/src/promql/tools
go 1.23.0 go 1.24.0
require ( require (
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc