Skip to content

Commit 8b38dbb

Browse files
nicolaasuninicolaasuni
committed
update dependencies and fix sed argument for linux and mac
1 parent eec06c7 commit 8b38dbb

4 files changed

Lines changed: 101 additions & 102 deletions

File tree

‎Makefile‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ else
127127
STATIC_FLAG=-static
128128
endif
129129

130+
# sed argument for in-place substitutions
131+
SEDINPLACE=-i
132+
ifeq ($(shell uname -s),Darwin)
133+
SEDINPLACE=-i ''
134+
endif
135+
130136
# Docker tag
131137
DOCKERTAG=$(VERSION)-$(RELEASE)
132138

@@ -155,7 +161,7 @@ GOFMT=$(shell which gofmt)
155161
GOTEST=$(GO) test
156162
GODOC=GOPATH=$(GOPATH) $(shell which godoc)
157163
GOLANGCILINT=$(BINUTIL)/golangci-lint
158-
GOLANGCILINTVERSION=v2.11.3
164+
GOLANGCILINTVERSION=v2.11.4
159165
DOCKERIZEVERSION=v0.9.2
160166

161167
# Current operating system and architecture as one string.
@@ -370,10 +376,10 @@ deb:
370376
cp -rf ./resources/debian $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian
371377
mkdir -p $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/missing-sources
372378
echo "// fake source for lintian" > $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/missing-sources/$(PROJECT).c
373-
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed --in-place=.bak "s/~#DATE#~/`date -R`/" {} \;
374-
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed --in-place=.bak "s/~#PKGNAME#~/$(PKGNAME)/" {} \;
375-
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed --in-place=.bak "s/~#VERSION#~/$(VERSION)/" {} \;
376-
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed --in-place=.bak "s/~#RELEASE#~/$(RELEASE)/" {} \;
379+
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed $(SEDINPLACE) "s/~#DATE#~/`date -R`/" {} \;
380+
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed $(SEDINPLACE) "s/~#PKGNAME#~/$(PKGNAME)/" {} \;
381+
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed $(SEDINPLACE) "s/~#VERSION#~/$(VERSION)/" {} \;
382+
find $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/ -type f -exec sed $(SEDINPLACE) "s/~#RELEASE#~/$(RELEASE)/" {} \;
377383
echo $(BINPATH) > $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/$(PKGNAME).dirs
378384
echo "$(BINPATH)* $(BINPATH)" > $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/install
379385
echo $(DOCPATH) >> $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/$(PKGNAME).dirs
@@ -680,14 +686,14 @@ updateall: updatego updatelint updatemod
680686
updatego:
681687
$(eval LAST_GO_TOOLCHAIN=$(shell curl -s https://go.dev/dl/ | grep -oE 'go[0-9]+\.[0-9]+\.[0-9]+\.linux-amd64\.tar\.gz' | head -n 1 | grep -oE 'go[0-9]+\.[0-9]+\.[0-9]+'))
682688
$(eval LAST_GO_VERSION=$(shell echo ${LAST_GO_TOOLCHAIN} | grep -oE '[0-9]+\.[0-9]+'))
683-
sed --in-place=.bak "s|^go [0-9]*\.[0-9]*.*$$|go ${LAST_GO_VERSION}|g" go.mod
684-
sed --in-place=.bak "s|^toolchain go[0-9]*\.[0-9]*\.[0-9]*$$|toolchain ${LAST_GO_TOOLCHAIN}|g" go.mod
689+
sed $(SEDINPLACE) "s|^go [0-9]*\.[0-9]*.*$$|go ${LAST_GO_VERSION}|g" go.mod
690+
sed $(SEDINPLACE) "s|^toolchain go[0-9]*\.[0-9]*\.[0-9]*$$|toolchain ${LAST_GO_TOOLCHAIN}|g" go.mod
685691

686692
# Update linter version
687693
.PHONY: updatelint
688694
updatelint:
689695
$(eval LAST_GOLANGCILINT_VERSION=$(shell curl -sL https://github.com/golangci/golangci-lint/releases/latest | sed -n 's/.*<title>Release \(v[0-9]*\.[0-9]*\.[0-9]*\).*/\1/p'))
690-
sed --in-place=.bak "s|^GOLANGCILINTVERSION=v[0-9]*\.[0-9]*\.[0-9]*$$|GOLANGCILINTVERSION=${LAST_GOLANGCILINT_VERSION}|g" Makefile
696+
sed $(SEDINPLACE) "s|^GOLANGCILINTVERSION=v[0-9]*\.[0-9]*\.[0-9]*$$|GOLANGCILINTVERSION=${LAST_GOLANGCILINT_VERSION}|g" Makefile
691697

692698
# Update dependencies
693699
.PHONY: updatemod

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.16
1+
3.2.17

‎go.mod‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ require (
1111
github.com/spf13/cobra v1.10.2
1212
github.com/spf13/viper v1.21.0
1313
github.com/stretchr/testify v1.11.1
14-
github.com/tecnickcom/gogen v1.129.1
14+
github.com/tecnickcom/gogen v1.130.2
1515
golang.org/x/sys v0.42.0
1616
)
1717

1818
require (
1919
cloud.google.com/go v0.123.0 // indirect
20-
cloud.google.com/go/auth v0.18.2 // indirect
20+
cloud.google.com/go/auth v0.19.0 // indirect
2121
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2222
cloud.google.com/go/compute/metadata v0.9.0 // indirect
2323
cloud.google.com/go/firestore v1.21.0 // indirect
@@ -37,15 +37,15 @@ require (
3737
github.com/go-logr/stdr v1.2.2 // indirect
3838
github.com/go-playground/locales v0.14.1 // indirect
3939
github.com/go-playground/universal-translator v0.18.1 // indirect
40-
github.com/go-playground/validator/v10 v10.30.1 // indirect
40+
github.com/go-playground/validator/v10 v10.30.2 // indirect
4141
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
4242
github.com/gogo/protobuf v1.3.2 // indirect
4343
github.com/golang/protobuf v1.5.4 // indirect
4444
github.com/google/s2a-go v0.1.9 // indirect
4545
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
46-
github.com/googleapis/gax-go/v2 v2.19.0 // indirect
46+
github.com/googleapis/gax-go/v2 v2.20.0 // indirect
4747
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
48-
github.com/hashicorp/consul/api v1.33.4 // indirect
48+
github.com/hashicorp/consul/api v1.33.7 // indirect
4949
github.com/hashicorp/errwrap v1.1.0 // indirect
5050
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5151
github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -67,21 +67,21 @@ require (
6767
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6868
github.com/modern-go/reflect2 v1.0.2 // indirect
6969
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
70-
github.com/nats-io/nats.go v1.49.0 // indirect
70+
github.com/nats-io/nats.go v1.50.0 // indirect
7171
github.com/nats-io/nkeys v0.4.15 // indirect
7272
github.com/nats-io/nuid v1.0.1 // indirect
73-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
73+
github.com/pelletier/go-toml/v2 v2.3.0 // indirect
7474
github.com/pkg/errors v0.9.1 // indirect
7575
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7676
github.com/prometheus/client_model v0.6.2 // indirect
7777
github.com/prometheus/common v0.67.5 // indirect
7878
github.com/prometheus/procfs v0.20.1 // indirect
79-
github.com/rs/zerolog v1.34.0 // indirect
79+
github.com/rs/zerolog v1.35.0 // indirect
8080
github.com/sagikazarmark/crypt v0.31.0 // indirect
8181
github.com/sagikazarmark/locafero v0.12.0 // indirect
8282
github.com/samber/lo v1.53.0 // indirect
83-
github.com/samber/slog-common v0.20.0 // indirect
84-
github.com/samber/slog-zerolog/v2 v2.9.1 // indirect
83+
github.com/samber/slog-common v0.21.0 // indirect
84+
github.com/samber/slog-zerolog/v2 v2.9.2 // indirect
8585
github.com/spf13/afero v1.15.0 // indirect
8686
github.com/spf13/cast v1.10.0 // indirect
8787
github.com/spf13/pflag v1.0.10 // indirect
@@ -111,10 +111,10 @@ require (
111111
golang.org/x/text v0.35.0 // indirect
112112
golang.org/x/time v0.15.0 // indirect
113113
golang.org/x/tools v0.43.0 // indirect
114-
google.golang.org/api v0.272.0 // indirect
115-
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
116-
google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7 // indirect
117-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
114+
google.golang.org/api v0.273.0 // indirect
115+
google.golang.org/genproto v0.0.0-20260330182312-d5a96adf58d8 // indirect
116+
google.golang.org/genproto/googleapis/api v0.0.0-20260330182312-d5a96adf58d8 // indirect
117+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260330182312-d5a96adf58d8 // indirect
118118
google.golang.org/grpc v1.79.3 // indirect
119119
google.golang.org/protobuf v1.36.11 // indirect
120120
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)