Skip to content

Commit

Permalink
chore(deps): Update golang to 1.22 (#195)
Browse files Browse the repository at this point in the history
Signed-off-by: william.vanhevelingen <william.vanhevelingen@acquia.com>
  • Loading branch information
blkperl authored Mar 13, 2024
1 parent 755abad commit b1a73c1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .promu.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit b1a73c1

Please sign in to comment.