Skip to content

Commit 018684c

Browse files
author
sapcc-bot
committed
Run go-makefile-maker and autoupdate dependencies
go: upgraded github.com/sapcc/go-bits v0.0.0-20260507090738-58bd3afe1717 => v0.0.0-20260508085658-b4794834db64
1 parent aa24607 commit 018684c

8 files changed

Lines changed: 9 additions & 22 deletions

File tree

.goreleaser.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ builds:
2525
- amd64
2626
- arm64
2727
ignore:
28+
- goos: darwin
29+
goarch: amd64
2830
- goos: windows
2931
goarch: arm64
3032
ldflags:

.license-scan-rules.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"allowlist": [
33
"Apache-2.0",
4+
"BSD-2-Clause",
45
"BSD-2-Clause-FreeBSD",
56
"BSD-3-Clause",
67
"EPL-2.0",

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM golang:1.26.3-alpine3.23 AS builder
55

6-
RUN apk add --no-cache --no-progress ca-certificates gcc git make musl-dev
6+
RUN apk add --no-cache --no-progress ca-certificates gcc musl-dev git make
77

88
COPY . /src
99
ARG BININFO_BUILD_DATE BININFO_COMMIT_HASH BININFO_VERSION # provided to 'make install'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ run-typos: FORCE install-typos
129129

130130
build/cover.out: FORCE generate install-setup-envtest | build
131131
@printf "\e[1;36m>> Running tests\e[0m\n"
132-
KUBEBUILDER_ASSETS=$$(setup-envtest use 1.34 -p path) go run github.com/onsi/ginkgo/v2/ginkgo run --randomize-all -output-dir=build $(GO_BUILDFLAGS) -ldflags '-s -w -X github.com/sapcc/go-api-declarations/bininfo.binName=absent-metrics-operator -X github.com/sapcc/go-api-declarations/bininfo.version=$(BININFO_VERSION) -X github.com/sapcc/go-api-declarations/bininfo.commit=$(BININFO_COMMIT_HASH) -X github.com/sapcc/go-api-declarations/bininfo.buildDate=$(BININFO_BUILD_DATE) $(GO_LDFLAGS)' -covermode=count -coverpkg=$(subst $(space),$(comma),$(GO_COVERPKGS)) $(GO_TESTFLAGS) $(GO_TESTPKGS)
132+
KUBEBUILDER_ASSETS=$$(setup-envtest use 1.36 -p path) go run github.com/onsi/ginkgo/v2/ginkgo run --randomize-all -output-dir=build $(GO_BUILDFLAGS) -ldflags '-s -w -X github.com/sapcc/go-api-declarations/bininfo.binName=absent-metrics-operator -X github.com/sapcc/go-api-declarations/bininfo.version=$(BININFO_VERSION) -X github.com/sapcc/go-api-declarations/bininfo.commit=$(BININFO_COMMIT_HASH) -X github.com/sapcc/go-api-declarations/bininfo.buildDate=$(BININFO_BUILD_DATE) $(GO_LDFLAGS)' -covermode=count -coverpkg=$(subst $(space),$(comma),$(GO_COVERPKGS)) $(GO_TESTFLAGS) $(GO_TESTPKGS)
133133
@awk < build/coverprofile.out '$$1 != "mode:" { is_filename[$$1] = true; counts1[$$1]+=$$2; counts2[$$1]+=$$3 } END { for (filename in is_filename) { printf "%s %d %d\n", filename, counts1[filename], counts2[filename]; } }' | sort | $(SED) '1s/^/mode: count\n/' > $@
134134

135135
build/cover.html: build/cover.out

REUSE.toml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -505,14 +505,6 @@ precedence = "override"
505505
SPDX-FileCopyrightText = "Other"
506506
SPDX-License-Identifier = "MIT"
507507

508-
[[annotations]]
509-
path = [
510-
"vendor/github.com/gogo/protobuf/**",
511-
]
512-
precedence = "override"
513-
SPDX-FileCopyrightText = "Other"
514-
SPDX-License-Identifier = "BSD-3-Clause"
515-
516508
[[annotations]]
517509
path = [
518510
"vendor/github.com/golang-jwt/jwt/v5/**",
@@ -529,14 +521,6 @@ precedence = "override"
529521
SPDX-FileCopyrightText = "Other"
530522
SPDX-License-Identifier = "BSD-3-Clause"
531523

532-
[[annotations]]
533-
path = [
534-
"vendor/github.com/google/btree/**",
535-
]
536-
precedence = "override"
537-
SPDX-FileCopyrightText = "Other"
538-
SPDX-License-Identifier = "Apache-2.0"
539-
540524
[[annotations]]
541525
path = [
542526
"vendor/github.com/google/gnostic-models/**",

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/prometheus/client_golang v1.23.2
1515
github.com/prometheus/prometheus v0.306.0
1616
github.com/sapcc/go-api-declarations v1.22.0
17-
github.com/sapcc/go-bits v0.0.0-20260507090738-58bd3afe1717
17+
github.com/sapcc/go-bits v0.0.0-20260508085658-b4794834db64
1818
go.uber.org/automaxprocs v1.6.0
1919
golang.org/x/sync v0.20.0
2020
golang.org/x/text v0.37.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
177177
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
178178
github.com/sapcc/go-api-declarations v1.22.0 h1:nU/eJ6OO54Z9YSo1gWinD0A2etrfZObCwYdB9xA0VWE=
179179
github.com/sapcc/go-api-declarations v1.22.0/go.mod h1:x3V8bzg7Y4kmbA+DeWWwKteFEdCCSiVQdwRXj4fGAYY=
180-
github.com/sapcc/go-bits v0.0.0-20260507090738-58bd3afe1717 h1:6H8zcKP7+1nc9cpD/SY2pH3izRPojIsNza+Pp+d4FFk=
181-
github.com/sapcc/go-bits v0.0.0-20260507090738-58bd3afe1717/go.mod h1:HlbUxBX5jObpd6owpG11w/RcnffZF0m0zLtsipqev48=
180+
github.com/sapcc/go-bits v0.0.0-20260508085658-b4794834db64 h1:KGASCehhL4D++59o8Yqm38Eba06by7DdddK+gCg8lGU=
181+
github.com/sapcc/go-bits v0.0.0-20260508085658-b4794834db64/go.mod h1:HlbUxBX5jObpd6owpG11w/RcnffZF0m0zLtsipqev48=
182182
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
183183
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
184184
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ github.com/prometheus/prometheus/util/strutil
178178
# github.com/sapcc/go-api-declarations v1.22.0
179179
## explicit; go 1.24
180180
github.com/sapcc/go-api-declarations/bininfo
181-
# github.com/sapcc/go-bits v0.0.0-20260507090738-58bd3afe1717
181+
# github.com/sapcc/go-bits v0.0.0-20260508085658-b4794834db64
182182
## explicit; go 1.26
183183
github.com/sapcc/go-bits/errext
184184
github.com/sapcc/go-bits/logg

0 commit comments

Comments
 (0)