chore: upgrade dependencies
This commit is contained in:
		
							
								
								
									
										83
									
								
								vendor/go.uber.org/zap/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										83
									
								
								vendor/go.uber.org/zap/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -1,50 +1,51 @@
 | 
			
		||||
export GOBIN ?= $(shell pwd)/bin
 | 
			
		||||
# Directory containing the Makefile.
 | 
			
		||||
PROJECT_ROOT = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 | 
			
		||||
 | 
			
		||||
GOLINT = $(GOBIN)/golint
 | 
			
		||||
STATICCHECK = $(GOBIN)/staticcheck
 | 
			
		||||
export GOBIN ?= $(PROJECT_ROOT)/bin
 | 
			
		||||
export PATH := $(GOBIN):$(PATH)
 | 
			
		||||
 | 
			
		||||
GOVULNCHECK = $(GOBIN)/govulncheck
 | 
			
		||||
BENCH_FLAGS ?= -cpuprofile=cpu.pprof -memprofile=mem.pprof -benchmem
 | 
			
		||||
 | 
			
		||||
# Directories containing independent Go modules.
 | 
			
		||||
#
 | 
			
		||||
# We track coverage only for the main module.
 | 
			
		||||
MODULE_DIRS = . ./benchmarks ./zapgrpc/internal/test
 | 
			
		||||
MODULE_DIRS = . ./exp ./benchmarks ./zapgrpc/internal/test
 | 
			
		||||
 | 
			
		||||
# Many Go tools take file globs or directories as arguments instead of packages.
 | 
			
		||||
GO_FILES := $(shell \
 | 
			
		||||
	find . '(' -path '*/.*' -o -path './vendor' ')' -prune \
 | 
			
		||||
	-o -name '*.go' -print | cut -b3-)
 | 
			
		||||
# Directories that we want to track coverage for.
 | 
			
		||||
COVER_DIRS = . ./exp
 | 
			
		||||
 | 
			
		||||
.PHONY: all
 | 
			
		||||
all: lint test
 | 
			
		||||
 | 
			
		||||
.PHONY: lint
 | 
			
		||||
lint: $(GOLINT) $(STATICCHECK)
 | 
			
		||||
	@rm -rf lint.log
 | 
			
		||||
	@echo "Checking formatting..."
 | 
			
		||||
	@gofmt -d -s $(GO_FILES) 2>&1 | tee lint.log
 | 
			
		||||
	@echo "Checking vet..."
 | 
			
		||||
	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && go vet ./... 2>&1) &&) true | tee -a lint.log
 | 
			
		||||
	@echo "Checking lint..."
 | 
			
		||||
	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && $(GOLINT) ./... 2>&1) &&) true | tee -a lint.log
 | 
			
		||||
	@echo "Checking staticcheck..."
 | 
			
		||||
	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && $(STATICCHECK) ./... 2>&1) &&) true | tee -a lint.log
 | 
			
		||||
	@echo "Checking for unresolved FIXMEs..."
 | 
			
		||||
	@git grep -i fixme | grep -v -e Makefile | tee -a lint.log
 | 
			
		||||
	@echo "Checking for license headers..."
 | 
			
		||||
	@./checklicense.sh | tee -a lint.log
 | 
			
		||||
	@[ ! -s lint.log ]
 | 
			
		||||
	@echo "Checking 'go mod tidy'..."
 | 
			
		||||
	@make tidy
 | 
			
		||||
	@if ! git diff --quiet; then \
 | 
			
		||||
		echo "'go mod tidy' resulted in changes or working tree is dirty:"; \
 | 
			
		||||
		git --no-pager diff; \
 | 
			
		||||
	fi
 | 
			
		||||
lint: golangci-lint tidy-lint license-lint
 | 
			
		||||
 | 
			
		||||
$(GOLINT):
 | 
			
		||||
	cd tools && go install golang.org/x/lint/golint
 | 
			
		||||
.PHONY: golangci-lint
 | 
			
		||||
golangci-lint:
 | 
			
		||||
	@$(foreach mod,$(MODULE_DIRS), \
 | 
			
		||||
		(cd $(mod) && \
 | 
			
		||||
		echo "[lint] golangci-lint: $(mod)" && \
 | 
			
		||||
		golangci-lint run --path-prefix $(mod)) &&) true
 | 
			
		||||
 | 
			
		||||
$(STATICCHECK):
 | 
			
		||||
	cd tools && go install honnef.co/go/tools/cmd/staticcheck
 | 
			
		||||
.PHONY: tidy
 | 
			
		||||
tidy:
 | 
			
		||||
	@$(foreach dir,$(MODULE_DIRS), \
 | 
			
		||||
		(cd $(dir) && go mod tidy) &&) true
 | 
			
		||||
 | 
			
		||||
.PHONY: tidy-lint
 | 
			
		||||
tidy-lint:
 | 
			
		||||
	@$(foreach mod,$(MODULE_DIRS), \
 | 
			
		||||
		(cd $(mod) && \
 | 
			
		||||
		echo "[lint] tidy: $(mod)" && \
 | 
			
		||||
		go mod tidy && \
 | 
			
		||||
		git diff --exit-code -- go.mod go.sum) &&) true
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
.PHONY: license-lint
 | 
			
		||||
license-lint:
 | 
			
		||||
	./checklicense.sh
 | 
			
		||||
 | 
			
		||||
$(GOVULNCHECK):
 | 
			
		||||
	cd tools && go install golang.org/x/vuln/cmd/govulncheck
 | 
			
		||||
 | 
			
		||||
.PHONY: test
 | 
			
		||||
test:
 | 
			
		||||
@@ -52,8 +53,10 @@ test:
 | 
			
		||||
 | 
			
		||||
.PHONY: cover
 | 
			
		||||
cover:
 | 
			
		||||
	go test -race -coverprofile=cover.out -coverpkg=./... ./...
 | 
			
		||||
	go tool cover -html=cover.out -o cover.html
 | 
			
		||||
	@$(foreach dir,$(COVER_DIRS), ( \
 | 
			
		||||
		cd $(dir) && \
 | 
			
		||||
		go test -race -coverprofile=cover.out -coverpkg=./... ./... \
 | 
			
		||||
		&& go tool cover -html=cover.out -o cover.html) &&) true
 | 
			
		||||
 | 
			
		||||
.PHONY: bench
 | 
			
		||||
BENCH ?= .
 | 
			
		||||
@@ -68,6 +71,6 @@ updatereadme:
 | 
			
		||||
	rm -f README.md
 | 
			
		||||
	cat .readme.tmpl | go run internal/readme/readme.go > README.md
 | 
			
		||||
 | 
			
		||||
.PHONY: tidy
 | 
			
		||||
tidy:
 | 
			
		||||
	@$(foreach dir,$(MODULE_DIRS),(cd $(dir) && go mod tidy) &&) true
 | 
			
		||||
.PHONY: vulncheck
 | 
			
		||||
vulncheck: $(GOVULNCHECK)
 | 
			
		||||
	$(GOVULNCHECK) ./...
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user