From 88ac5b16f8448afee9a3064e56ddf840b1937ff9 Mon Sep 17 00:00:00 2001 From: "william.vanhevelingen" Date: Wed, 13 Mar 2024 13:11:11 -0700 Subject: [PATCH 1/5] chore(deps): Update golang to 1.22 Signed-off-by: william.vanhevelingen --- .github/workflows/ci.yml | 4 ++-- .promu.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df3e478..51a3217 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@v3 - uses: prometheus/promci@v0.0.2 @@ -40,7 +40,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '<1.19' + go-version: '<1.22' - name: Lint uses: golangci/golangci-lint-action@v3.2.0 with: 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 From 8ca6c5a554d0269483346710f6059aebade3aaeb Mon Sep 17 00:00:00 2001 From: "william.vanhevelingen" Date: Wed, 13 Mar 2024 14:09:29 -0700 Subject: [PATCH 2/5] try 1.21 --- .github/workflows/ci.yml | 4 ++-- .promu.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 748eedb..06fb1dd 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.22-base + image: quay.io/prometheus/golang-builder:1.21-base steps: - uses: actions/checkout@v4 - uses: prometheus/promci@v0.1.0 @@ -40,7 +40,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '<1.22' + go-version: '<1.21' - name: Lint uses: golangci/golangci-lint-action@v4.0.0 with: diff --git a/.promu.yml b/.promu.yml index 2d13006..b90b9c4 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,7 +1,7 @@ go: # Whenever the Go version is updated here, # .github/workflows/ci.yml should also be updated. - version: 1.22 + version: 1.21 # cgo: false repository: path: github.com/Lusitaniae/apache_exporter From c5179555ab34580579d07fb1477f050f8b721edb Mon Sep 17 00:00:00 2001 From: "william.vanhevelingen" Date: Wed, 13 Mar 2024 14:23:05 -0700 Subject: [PATCH 3/5] try new prometheus --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 27a991f6803e5af6d848f4316c9a859b22215099 Mon Sep 17 00:00:00 2001 From: "william.vanhevelingen" Date: Wed, 13 Mar 2024 14:23:27 -0700 Subject: [PATCH 4/5] Revert "try 1.21" This reverts commit 8ca6c5a554d0269483346710f6059aebade3aaeb. --- .github/workflows/ci.yml | 4 ++-- .promu.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06fb1dd..748eedb 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.21-base + image: quay.io/prometheus/golang-builder:1.22-base steps: - uses: actions/checkout@v4 - uses: prometheus/promci@v0.1.0 @@ -40,7 +40,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '<1.21' + go-version: '<1.22' - name: Lint uses: golangci/golangci-lint-action@v4.0.0 with: diff --git a/.promu.yml b/.promu.yml index b90b9c4..2d13006 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,7 +1,7 @@ go: # Whenever the Go version is updated here, # .github/workflows/ci.yml should also be updated. - version: 1.21 + version: 1.22 # cgo: false repository: path: github.com/Lusitaniae/apache_exporter From 7c6edc7e854cbd9cc2ef2936c764e3d67b7ec5e4 Mon Sep 17 00:00:00 2001 From: "william.vanhevelingen" Date: Wed, 13 Mar 2024 14:30:17 -0700 Subject: [PATCH 5/5] bump lint --- .github/workflows/ci.yml | 1 + Makefile.common | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 748eedb..633c68c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,7 @@ jobs: - 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/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))