Skip to content

Commit c442aaf

Browse files
author
sapcc-bot
committed
Run go-makefile-maker and autoupdate dependencies
go: upgraded github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4 => v0.0.0-20250924092957-bcc75ecf4553
1 parent b8ec213 commit c442aaf

File tree

6 files changed

+44
-12
lines changed

6 files changed

+44
-12
lines changed

Makefile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company
77
# SPDX-License-Identifier: Apache-2.0
88

9+
# macOS ships with make 3.81 from 2006, which does not support all the features that we want (e.g. --warn-undefined-variables)
10+
ifeq ($(MAKE_VERSION),3.81)
11+
ifeq (,$(shell which gmake 2>/dev/null))
12+
$(error We do not support this "make" version ($(MAKE_VERSION)) which is two decades old. Please install a newer version, e.g. using "brew install make")
13+
else
14+
$(error We do not support this "make" version ($(MAKE_VERSION)) which is two decades old. You have a newer GNU make installed, so please run "gmake" instead)
15+
endif
16+
endif
17+
918
MAKEFLAGS=--warn-undefined-variables
1019
# /bin/sh is dash on Debian which does not support all features of ash/bash
1120
# to fix that we use /bin/bash only on Debian to not break Alpine
@@ -34,7 +43,7 @@ install-modernize: FORCE
3443
@if ! hash modernize 2>/dev/null; then printf "\e[1;36m>> Installing modernize (this may take a while)...\e[0m\n"; go install golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest; fi
3544

3645
install-shellcheck: FORCE
37-
@if ! hash shellcheck 2>/dev/null; then printf "\e[1;36m>> Installing shellcheck...\e[0m\n"; SHELLCHECK_ARCH=$(shell uname -m); SHELLCHECK_OS=$(shell uname -s | tr '[:upper:]' '[:lower:]'); if [[ "$$SHELLCHECK_OS" == "darwin" ]]; then SHELLCHECK_OS=macos; fi; SHELLCHECK_VERSION="stable"; if command -v curl >/dev/null 2>&1; then GET="curl -sLo-"; elif command -v wget >/dev/null 2>&1; then GET="wget -O-"; else echo "Didn't find curl or wget to download shellcheck"; exit 2; fi; $$GET "https://github.com/koalaman/shellcheck/releases/download/$$SHELLCHECK_VERSION/shellcheck-$$SHELLCHECK_VERSION.$$SHELLCHECK_OS.$$SHELLCHECK_ARCH.tar.xz" | tar -Jxf -; BIN=$$(go env GOBIN); if [[ -z $$BIN ]]; then BIN=$$(go env GOPATH)/bin; fi; install -Dm755 shellcheck-$$SHELLCHECK_VERSION/shellcheck -t "$$BIN"; rm -rf shellcheck-$$SHELLCHECK_VERSION; fi
46+
@if ! hash shellcheck 2>/dev/null; then printf "\e[1;36m>> Installing shellcheck...\e[0m\n"; SHELLCHECK_ARCH=$(shell uname -m); if [[ "$$SHELLCHECK_ARCH" == "arm64" ]]; then SHELLCHECK_ARCH=aarch64; fi; SHELLCHECK_OS=$(shell uname -s | tr '[:upper:]' '[:lower:]'); SHELLCHECK_VERSION="stable"; if command -v curl >/dev/null 2>&1; then GET="curl -sLo-"; elif command -v wget >/dev/null 2>&1; then GET="wget -O-"; else echo "Didn't find curl or wget to download shellcheck"; exit 2; fi; $$GET "https://github.com/koalaman/shellcheck/releases/download/$$SHELLCHECK_VERSION/shellcheck-$$SHELLCHECK_VERSION.$$SHELLCHECK_OS.$$SHELLCHECK_ARCH.tar.xz" | tar -Jxf -; BIN=$$(go env GOBIN); if [[ -z $$BIN ]]; then BIN=$$(go env GOPATH)/bin; fi; install -Dm755 shellcheck-$$SHELLCHECK_VERSION/shellcheck -t "$$BIN"; rm -rf shellcheck-$$SHELLCHECK_VERSION; fi
3847

3948
install-go-licence-detector: FORCE
4049
@if ! hash go-licence-detector 2>/dev/null; then printf "\e[1;36m>> Installing go-licence-detector (this may take a while)...\e[0m\n"; go install go.elastic.co/go-licence-detector@latest; fi
@@ -47,7 +56,7 @@ install-reuse: FORCE
4756

4857
prepare-static-check: FORCE install-golangci-lint install-modernize install-shellcheck install-go-licence-detector install-addlicense install-reuse
4958

50-
# To add additional flags or values, specify the variable in the environment, e.g. `GO_BUILDFLAGS='-tags experimental' make`.
59+
# To add additional flags or values (before the default ones), specify the variable in the environment, e.g. `GO_BUILDFLAGS='-tags experimental' make`.
5160
# To override the default flags or values, specify the variable on the command line, e.g. `make GO_BUILDFLAGS='-tags experimental'`.
5261
GO_BUILDFLAGS += -mod vendor
5362
GO_LDFLAGS +=
@@ -127,7 +136,7 @@ run-shellcheck: FORCE install-shellcheck
127136

128137
build/cover.out: FORCE | build
129138
@printf "\e[1;36m>> Running tests\e[0m\n"
130-
@env $(GO_TESTENV) go test -shuffle=on -p 1 -coverprofile=build/coverprofile.out $(GO_BUILDFLAGS) -ldflags '-s -w -X github.com/sapcc/go-api-declarations/bininfo.binName=gatekeeper-addons -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)
139+
@env $(GO_TESTENV) go test -shuffle=on -coverprofile=build/coverprofile.out $(GO_BUILDFLAGS) -ldflags '-s -w -X github.com/sapcc/go-api-declarations/bininfo.binName=gatekeeper-addons -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)
131140
@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/' > $@
132141

133142
build/cover.html: build/cover.out
@@ -199,6 +208,7 @@ vars: FORCE
199208
@printf "GO_TESTFLAGS=$(GO_TESTFLAGS)\n"
200209
@printf "GO_TESTPKGS=$(GO_TESTPKGS)\n"
201210
@printf "MAKE=$(MAKE)\n"
211+
@printf "MAKE_VERSION=$(MAKE_VERSION)\n"
202212
@printf "PREFIX=$(PREFIX)\n"
203213
@printf "SED=$(SED)\n"
204214
@printf "UNAME_S=$(UNAME_S)\n"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/pkg/errors v0.9.1
1414
github.com/prometheus/client_golang v1.23.2
1515
github.com/sapcc/go-api-declarations v1.17.4
16-
github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4
16+
github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553
1717
go.uber.org/automaxprocs v1.6.0
1818
gopkg.in/yaml.v2 v2.4.0
1919
k8s.io/apimachinery v0.29.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
122122
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
123123
github.com/sapcc/go-api-declarations v1.17.4 h1:F4smuE9x1NJ/7NAdytJ1wekeXT3QeRaYu3L/HyWKqqo=
124124
github.com/sapcc/go-api-declarations v1.17.4/go.mod h1:MWmLjmvjftgyAugNUfIhsDsHIzXH1pn32cWLZpiluKg=
125-
github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4 h1:9SrJTmXMhUBaMGCVGp/7FfJ8ku3aeeuQ4PQtqtTx8wI=
126-
github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4/go.mod h1:+hy4RXW/4ZnFl/Ct7vBl9cnLEA9Lt/BKYYGoxZkwLZY=
125+
github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553 h1:CWbbQgtHq+RPAaPjPZC7z2uJJhaRGJMBymnnzXaWFj8=
126+
github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553/go.mod h1:+hy4RXW/4ZnFl/Ct7vBl9cnLEA9Lt/BKYYGoxZkwLZY=
127127
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
128128
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
129129
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=

vendor/github.com/sapcc/go-bits/assert/assert.go

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/sapcc/go-bits/assert/http.go

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ github.com/prometheus/procfs/internal/util
201201
# github.com/sapcc/go-api-declarations v1.17.4
202202
## explicit; go 1.24
203203
github.com/sapcc/go-api-declarations/bininfo
204-
# github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4
204+
# github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553
205205
## explicit; go 1.24
206206
github.com/sapcc/go-bits/assert
207207
github.com/sapcc/go-bits/errext

0 commit comments

Comments
 (0)