From b1a73c18714a5a8a2fc6a4b396ee85c699a7474f Mon Sep 17 00:00:00 2001 From: William Van Hevelingen Date: Wed, 13 Mar 2024 14:49:57 -0700 Subject: [PATCH] chore(deps): Update golang to 1.22 (#195) Signed-off-by: william.vanhevelingen --- .github/workflows/ci.yml | 5 +++-- .promu.yml | 4 ++-- Makefile | 2 +- Makefile.common | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31ddd2e..633c68c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: # Whenever the Go version is updated here, .promu.yml # should also be updated. container: - image: quay.io/prometheus/golang-builder:1.19-base + image: quay.io/prometheus/golang-builder:1.22-base steps: - uses: actions/checkout@v4 - uses: prometheus/promci@v0.1.0 @@ -40,10 +40,11 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '<1.19' + go-version: '<1.22' - name: Lint uses: golangci/golangci-lint-action@v4.0.0 with: + # Keep in sync with Makefile.common version: v1.56.2 # modified from the original as this repo still using master, insteead of main diff --git a/.promu.yml b/.promu.yml index a419c6d..2d13006 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.19 + # .github/workflows/ci.yml should also be updated. + version: 1.22 # cgo: false repository: path: github.com/Lusitaniae/apache_exporter diff --git a/Makefile b/Makefile index 3cfd8df..ae6c68a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ all:: vet checkmetrics common-all include Makefile.common -PROMETHEUS_VERSION=2.39.1 +PROMETHEUS_VERSION=2.50.1 PROMTOOL ?= /tmp/prometheus-$(PROMETHEUS_VERSION).linux-amd64/promtool .PHONY: checkmetrics diff --git a/Makefile.common b/Makefile.common index d46c9db..ad37407 100644 --- a/Makefile.common +++ b/Makefile.common @@ -83,7 +83,8 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_ GOLANGCI_LINT := GOLANGCI_LINT_OPTS ?= -GOLANGCI_LINT_VERSION ?= v1.51.1 +# Keep in sync .github/workflows/ci.yaml +GOLANGCI_LINT_VERSION ?= v1.56.2 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64. # windows isn't included here because of the path separator being different. ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))