File tree 2 files changed +8
-127
lines changed 2 files changed +8
-127
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ COMMA := ,
27
27
XGO_VERSION := go-1.17.x
28
28
MIN_GO_VERSION := 001016000
29
29
MIN_NODE_VERSION := 012017000
30
- MIN_GOLANGCI_LINT_VERSION = 1.43.0
30
+ MIN_GOLANGCI_LINT_VERSION := 001043000
31
31
32
32
DOCKER_IMAGE ?= gitea/gitea
33
33
DOCKER_TAG ?= latest
@@ -766,17 +766,21 @@ pr\#%: clean-all
766
766
$(GO ) run contrib/pr/checkout.go $*
767
767
768
768
.PHONY : golangci-lint
769
- golangci-lint :
769
+ golangci-lint : golangci-lint-check
770
+ golangci-lint run --timeout 10m
771
+
772
+ .PHONY : golangci-lint-check
773
+ golangci-lint-check :
774
+ $(eval GOLANGCI_LINT_VERSION := $(shell printf "% 03d% 03d% 03d" $(shell golangci-lint --version | grep -Eo '[0-9]+\.[0-9.]+' | tr '.' ' ') ;) )
770
775
@hash golangci-lint > /dev/null 2>&1 ; if [ $$ ? -ne 0 ]; then \
771
776
echo " Downloading golangci-lint" ; \
772
777
export BINARY=" golangci-lint" ; \
773
778
curl -sfL " https://raw.githubusercontent.com/golangci/golangci-lint/${MIN_GOLANGCI_LINT_VERSION} " | sh -s -- -b $(GOPATH ) /bin v$(MIN_GOLANGCI_LINT_VERSION ) ; \
774
- elif $( GO ) run contrib/golangci-lint/check-version.go $(MIN_GOLANGCI_LINT_VERSION ) > /dev/null 2>&1 ; then \
779
+ elif [ " $( GOLANGCI_LINT_VERSION ) " -lt " $( MIN_GOLANGCI_LINT_VERSION) " ] ; then \
775
780
echo " Downloading newer version of golangci-lint" ; \
776
781
export BINARY=" golangci-lint" ; \
777
782
curl -sfL " https://raw.githubusercontent.com/golangci/golangci-lint/${MIN_GOLANGCI_LINT_VERSION} " | sh -s -- -b $(GOPATH ) /bin v$(MIN_GOLANGCI_LINT_VERSION ) ; \
778
783
fi
779
- golangci-lint run --timeout 10m
780
784
781
785
.PHONY : docker
782
786
docker :
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments