Skip to content

Commit

Permalink
make vendor work again with go 1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
sni committed Mar 6, 2024
1 parent 9c3b9d8 commit 013b581
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

CMDS = $(shell cd ./cmd && ls -1)

tools: | versioncheck vendor go.work dump
tools: | versioncheck vendor
$(GO) mod download
set -e; for DEP in $(shell grep "_ " buildtools/tools.go | awk '{ print $$2 }'); do \
( cd buildtools && $(GO) install $$DEP ) ; \
Expand All @@ -29,7 +29,7 @@ tools: | versioncheck vendor go.work dump
( cd buildtools && $(GO) mod tidy )
# pin these dependencies
( cd buildtools && $(GO) get github.com/golangci/golangci-lint@latest )
$(GO) mod vendor
$(MAKE) vendor

updatedeps: versioncheck
$(MAKE) clean
Expand All @@ -51,7 +51,7 @@ cleandeps:
vendor: go.work
$(GO) mod download
$(GO) mod tidy
$(GO) mod vendor
GOWORK=off $(GO) mod vendor

go.work:
echo "go $(MINGOVERSIONSTR)" > go.work
Expand Down Expand Up @@ -192,6 +192,8 @@ clean:
rm -f coverage.txt
rm -f mod-gearman*.html
rm -rf vendor/
rm -rf go.work
rm -rf go.work.sum
rm -rf $(TOOLSFOLDER)

GOVET=go vet -all
Expand Down

0 comments on commit 013b581

Please sign in to comment.