Skip to content

Commit 98d6bc9

Browse files
author
sapcc-bot
committed
Run go-makefile-maker and autoupdate dependencies
go: upgraded github.com/sapcc/go-bits v0.0.0-20250923125804-74150ab82271 => v0.0.0-20250924092957-bcc75ecf4553
1 parent 025278e commit 98d6bc9

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

Makefile

Lines changed: 12 additions & 2 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
@@ -42,7 +51,7 @@ install-modernize: FORCE
4251
@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
4352

4453
install-shellcheck: FORCE
45-
@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
54+
@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
4655

4756
install-go-licence-detector: FORCE
4857
@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
@@ -55,7 +64,7 @@ install-reuse: FORCE
5564

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

58-
# To add additional flags or values, specify the variable in the environment, e.g. `GO_BUILDFLAGS='-tags experimental' make`.
67+
# To add additional flags or values (before the default ones), specify the variable in the environment, e.g. `GO_BUILDFLAGS='-tags experimental' make`.
5968
# To override the default flags or values, specify the variable on the command line, e.g. `make GO_BUILDFLAGS='-tags experimental'`.
6069
GO_BUILDFLAGS += -mod vendor
6170
GO_LDFLAGS +=
@@ -187,6 +196,7 @@ vars: FORCE
187196
@printf "GO_TESTFLAGS=$(GO_TESTFLAGS)\n"
188197
@printf "GO_TESTPKGS=$(GO_TESTPKGS)\n"
189198
@printf "MAKE=$(MAKE)\n"
199+
@printf "MAKE_VERSION=$(MAKE_VERSION)\n"
190200
@printf "PREFIX=$(PREFIX)\n"
191201
@printf "SED=$(SED)\n"
192202
@printf "UNAME_S=$(UNAME_S)\n"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/klauspost/compress v1.18.0
1111
github.com/majewsky/schwift/v2 v2.0.0
1212
github.com/sapcc/go-api-declarations v1.17.4
13-
github.com/sapcc/go-bits v0.0.0-20250923125804-74150ab82271
13+
github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553
1414
github.com/ulikunitz/xz v0.5.15
1515
go.uber.org/automaxprocs v1.6.0
1616
golang.org/x/crypto v0.42.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4
3030
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
3131
github.com/sapcc/go-api-declarations v1.17.4 h1:F4smuE9x1NJ/7NAdytJ1wekeXT3QeRaYu3L/HyWKqqo=
3232
github.com/sapcc/go-api-declarations v1.17.4/go.mod h1:MWmLjmvjftgyAugNUfIhsDsHIzXH1pn32cWLZpiluKg=
33-
github.com/sapcc/go-bits v0.0.0-20250923125804-74150ab82271 h1:I7aXOgqwUXlQyVGYMq0SVm73L3l7kwYGwD76wYJLRnE=
34-
github.com/sapcc/go-bits v0.0.0-20250923125804-74150ab82271/go.mod h1:+hy4RXW/4ZnFl/Ct7vBl9cnLEA9Lt/BKYYGoxZkwLZY=
33+
github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553 h1:CWbbQgtHq+RPAaPjPZC7z2uJJhaRGJMBymnnzXaWFj8=
34+
github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553/go.mod h1:+hy4RXW/4ZnFl/Ct7vBl9cnLEA9Lt/BKYYGoxZkwLZY=
3535
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
3636
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
3737
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ github.com/majewsky/schwift/v2/internal/errext
4545
# github.com/sapcc/go-api-declarations v1.17.4
4646
## explicit; go 1.24
4747
github.com/sapcc/go-api-declarations/bininfo
48-
# github.com/sapcc/go-bits v0.0.0-20250923125804-74150ab82271
48+
# github.com/sapcc/go-bits v0.0.0-20250924092957-bcc75ecf4553
4949
## explicit; go 1.24
5050
github.com/sapcc/go-bits/errext
5151
github.com/sapcc/go-bits/httpext

0 commit comments

Comments
 (0)