Update Go version

Update build/test to use Go 1.21.

Signed-off-by: Michal Biesek <michalbiesek@gmail.com>
This commit is contained in:
Michal Biesek 2023-08-14 23:14:09 +02:00
parent 54aaa2bd7e
commit 7d1110a679
No known key found for this signature in database
GPG key ID: FFF2B9B1C73BB3CA
4 changed files with 8 additions and 8 deletions

View file

@ -11,7 +11,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.20-base image: quay.io/prometheus/golang-builder:1.21-base
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: prometheus/promci@v0.1.0 - uses: prometheus/promci@v0.1.0
@ -32,7 +32,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.20-base image: quay.io/prometheus/golang-builder:1.21-base
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '>=1.20 <1.21' go-version: '>=1.21 <1.22'
- run: | - run: |
$TestTargets = go list ./... | Where-Object { $_ -NotMatch "(github.com/prometheus/prometheus/discovery.*|github.com/prometheus/prometheus/config|github.com/prometheus/prometheus/web)"} $TestTargets = go list ./... | Where-Object { $_ -NotMatch "(github.com/prometheus/prometheus/discovery.*|github.com/prometheus/prometheus/config|github.com/prometheus/prometheus/web)"}
go test $TestTargets -vet=off -v go test $TestTargets -vet=off -v
@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# The go verson in this image should be N-1 wrt test_go. # The go verson in this image should be N-1 wrt test_go.
container: container:
image: quay.io/prometheus/golang-builder:1.19-base image: quay.io/prometheus/golang-builder:1.20-base
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: make build - run: make build
@ -79,7 +79,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.19-base image: quay.io/prometheus/golang-builder:1.20-base
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: go install ./cmd/promtool/. - run: go install ./cmd/promtool/.

View file

@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '>=1.20 <1.21' go-version: '>=1.21 <1.22'
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v2

View file

@ -1,7 +1,7 @@
go: go:
# Whenever the Go version is updated here, # Whenever the Go version is updated here,
# .circle/config.yml should also be updated. # .circle/config.yml should also be updated.
version: 1.20 version: 1.21
repository: repository:
path: github.com/prometheus/prometheus path: github.com/prometheus/prometheus
build: build:

2
go.mod
View file

@ -1,6 +1,6 @@
module github.com/prometheus/prometheus module github.com/prometheus/prometheus
go 1.19 go 1.20
require ( require (
github.com/Azure/azure-sdk-for-go v65.0.0+incompatible github.com/Azure/azure-sdk-for-go v65.0.0+incompatible