From 42eb536084f04d28b698b0b5c3976650de714ffe Mon Sep 17 00:00:00 2001 From: SuperQ Date: Wed, 16 Oct 2024 15:02:24 +0200 Subject: [PATCH] Update Go to 1.23 * Update Go build to 1.23. * Update minimum Go version to 1.22. Signed-off-by: SuperQ --- .circleci/config.yml | 4 ++-- .github/workflows/ci.yml | 2 +- .github/workflows/mixin.yml | 2 +- .promu.yml | 2 +- go.mod | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e37a4376f..412932f4d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: prometheus: prometheus/prometheus@0.17.1 - go: circleci/go@1.11.0 + go: circleci/go@1.12.0 jobs: test_frontend: # We need to use a machine executor because the front-end validation runs @@ -18,7 +18,7 @@ jobs: command: sudo rm -rf /usr/local/go # Whenever the Go version is updated here, .promu.yml should also be updated. - go/install: - version: "1.22.6" + version: "1.23.2" - run: name: Remove generated code command: make clean diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1560199789..d6c37510d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: # Whenever the Go version is updated here, .promu.yml # should also be updated. container: - image: quay.io/prometheus/golang-builder:1.22-base + image: quay.io/prometheus/golang-builder:1.23-base steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0 diff --git a/.github/workflows/mixin.yml b/.github/workflows/mixin.yml index d9f07ef7c8..faec300ee1 100644 --- a/.github/workflows/mixin.yml +++ b/.github/workflows/mixin.yml @@ -14,7 +14,7 @@ jobs: - name: install Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x # pin the mixtool version until https://github.com/monitoring-mixins/mixtool/issues/135 is merged. - run: go install github.com/monitoring-mixins/mixtool/cmd/mixtool@2282201396b69055bb0f92f187049027a16d2130 - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest diff --git a/.promu.yml b/.promu.yml index 2f8d759f88..b3f6bd32ba 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,7 +1,7 @@ go: # Whenever the Go version is updated here, # .circle/config.yml should also be updated. - version: 1.22 + version: 1.23 repository: path: github.com/prometheus/alertmanager build: diff --git a/go.mod b/go.mod index f2b7577f77..e5b6ae71ba 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/prometheus/alertmanager -go 1.21.8 - -toolchain go1.22.4 +go 1.22 require ( github.com/KimMachineGun/automemlimit v0.6.1