@@ -3,6 +3,8 @@ EPOCH_TEST_COMMIT ?= v0.2.0
3
3
DOCKER ?= $(shell command -v docker 2>/dev/null)
4
4
PANDOC ?= $(shell command -v pandoc 2>/dev/null)
5
5
6
+ GOPATH: =$(shell go env GOPATH)
7
+
6
8
OUTPUT_DIRNAME ?= output
7
9
DOC_FILENAME ?= oci-image-spec
8
10
@@ -87,7 +89,7 @@ check-license:
87
89
88
90
lint : .install.lint
89
91
@echo " checking lint"
90
- @GO111MODULE=on golangci-lint run
92
+ @GO111MODULE=on $( GOPATH ) /bin/ golangci-lint run
91
93
92
94
test : schema/fs.go
93
95
go test -race -cover $(shell go list ./... | grep -v /vendor/)
@@ -100,18 +102,22 @@ img/%.png: img/%.dot
100
102
.gitvalidation :
101
103
@which git-validation > /dev/null 2> /dev/null || (echo " ERROR: git-validation not found. Consider 'make install.tools' target" && false)
102
104
ifdef GITHUB_SHA
103
- git-validation -q -run DCO,short-subject,dangling-whitespace -range $(GITHUB_SHA)..HEAD
105
+ $(GOPATH)/bin/ git-validation -q -run DCO,short-subject,dangling-whitespace -range $(GITHUB_SHA)..HEAD
104
106
else
105
- git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD
107
+ $(GOPATH)/bin/ git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD
106
108
endif
107
109
108
110
install.tools : $(TOOLS:%=.install.% )
109
111
110
112
.install.lint :
111
- go get github.com/golangci/golangci-lint/cmd/
[email protected]
113
+ case " $$ (go env GOVERSION)" in \
114
+ go1.17.
* ) go install github.com/golangci/golangci-lint/cmd/
[email protected] ;; \
115
+ go1.18.
* ) go install github.com/golangci/golangci-lint/cmd/
[email protected] ;; \
116
+ * ) go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest;; \
117
+ esac
112
118
113
119
.install.gitvalidation :
114
- go get -u github.com/vbatts/git-validation
120
+ go install github.com/vbatts/git-validation@latest
115
121
116
122
clean :
117
123
rm -rf * ~ $(OUTPUT_DIRNAME ) header.html
0 commit comments