Skip to content

Commit 572dc3f

Browse files
author
Gusted
committed
Simplify golangci-lint version check
1 parent e6b2794 commit 572dc3f

File tree

2 files changed

+8
-127
lines changed

2 files changed

+8
-127
lines changed

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ COMMA := ,
2727
XGO_VERSION := go-1.17.x
2828
MIN_GO_VERSION := 001016000
2929
MIN_NODE_VERSION := 012017000
30-
MIN_GOLANGCI_LINT_VERSION = 1.43.0
30+
MIN_GOLANGCI_LINT_VERSION := 001043000
3131

3232
DOCKER_IMAGE ?= gitea/gitea
3333
DOCKER_TAG ?= latest
@@ -766,17 +766,21 @@ pr\#%: clean-all
766766
$(GO) run contrib/pr/checkout.go $*
767767

768768
.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 '.' ' ');))
770775
@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
771776
echo "Downloading golangci-lint"; \
772777
export BINARY="golangci-lint"; \
773778
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 \
775780
echo "Downloading newer version of golangci-lint"; \
776781
export BINARY="golangci-lint"; \
777782
curl -sfL "https://raw.githubusercontent.com/golangci/golangci-lint/${MIN_GOLANGCI_LINT_VERSION}" | sh -s -- -b $(GOPATH)/bin v$(MIN_GOLANGCI_LINT_VERSION); \
778783
fi
779-
golangci-lint run --timeout 10m
780784

781785
.PHONY: docker
782786
docker:

contrib/golangci-lint/check-version.go

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)