Skip to content

Commit d0aeb87

Browse files
authored
Update Go, dependencies and tools (#130)
1 parent a9c2e60 commit d0aeb87

File tree

15 files changed

+363
-678
lines changed

15 files changed

+363
-678
lines changed

.bingo/Variables.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
2323
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
2424
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
2525

26-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.62.2
26+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.5.0
2727
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
2828
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29-
@echo "(re)installing $(GOBIN)/golangci-lint-v1.62.2"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.62.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
29+
@echo "(re)installing $(GOBIN)/golangci-lint-v2.5.0"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.5.0 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
3131

3232
PROMTOOL := $(GOBIN)/promtool-v0.306.0
3333
$(PROMTOOL): $(BINGO_DIR)/promtool.mod

.bingo/bingo.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.20
3+
go 1.23.0
4+
5+
toolchain go1.25.1
46

57
require github.com/bwplotka/bingo v0.9.0

.bingo/golangci-lint.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.22.1
3+
go 1.25.1
44

5-
toolchain go1.23.4
6-
7-
require github.com/golangci/golangci-lint v1.62.2 // cmd/golangci-lint
5+
require github.com/golangci/golangci-lint/v2 v2.5.0 // cmd/golangci-lint

.bingo/golangci-lint.sum

Lines changed: 285 additions & 613 deletions
Large diffs are not rendered by default.

.bingo/promtool.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

33
go 1.23.0
44

5-
toolchain go1.23.4
5+
toolchain go1.25.1
66

77
replace github.com/fsnotify/fsnotify v1.8.0 => github.com/fsnotify/fsnotify v1.7.0
88

.bingo/variables.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010

1111
BINGO="${GOBIN}/bingo-v0.9.0"
1212

13-
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.62.2"
13+
GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.5.0"
1414

1515
PROMTOOL="${GOBIN}/promtool-v0.306.0"
1616

.github/workflows/package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version-file: go.mod
23+
go-version: "1.25.1" # workaround for tests failing with automatically-downloaded Go toolchain (https://github.com/golang/go/issues/75031)
2424
- name: Build and Test
2525
run: make
2626
docker:

.github/workflows/pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: actions/setup-go@v5
1212
with:
13-
go-version-file: go.mod
13+
go-version: "1.25.1"
1414
- name: golangci-lint
15-
uses: golangci/golangci-lint-action@v4
15+
uses: golangci/golangci-lint-action@v8
1616
with:
17-
version: v1.62.2
17+
version: v2.5.0
1818
- name: promtool
1919
run: make lint-promtool

.golangci.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
version: "2"
12
linters:
3+
exclusions:
4+
generated: lax
5+
presets:
6+
- comments
7+
- common-false-positives
8+
- legacy
9+
- std-error-handling
10+
paths:
11+
- third_party$
12+
- builtin$
13+
- examples$
14+
formatters:
215
enable:
316
- gofumpt
17+
exclusions:
18+
generated: lax
19+
paths:
20+
- third_party$
21+
- builtin$
22+
- examples$

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine AS builder
1+
FROM --platform=$BUILDPLATFORM golang:1.25.1-alpine AS builder
22

33
ARG TARGETOS
44
ARG TARGETARCH
@@ -17,7 +17,7 @@ RUN go mod verify
1717
COPY . /build/
1818
RUN make build-binary
1919

20-
FROM --platform=$TARGETPLATFORM busybox
20+
FROM busybox
2121
LABEL maintainer="Robert Jacob <[email protected]>"
2222

2323
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

0 commit comments

Comments
 (0)