From 993c3bfb3ea10185d981469014460215b6ca9d9d Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Mon, 11 May 2020 21:38:03 -0700 Subject: [PATCH] linter: fixed how linter is installed on Darwin and Linux since it was getting wrong version --- tools/tools.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/tools.mk b/tools/tools.mk index 977e98590..cae7b5cd7 100644 --- a/tools/tools.mk +++ b/tools/tools.mk @@ -84,7 +84,7 @@ SELF_DIR := $(subst /,$(slash),$(realpath $(dir $(lastword $(MAKEFILE_LIST))))) TOOLS_DIR:=$(SELF_DIR)$(slash).tools # tool versions -GOLANGCI_LINT_VERSION=1.23.6 +GOLANGCI_LINT_VERSION=1.23.7 NODE_VERSION=12.16.1 HUGO_VERSION=0.67.1 GORELEASER_VERSION=v0.128.0 @@ -153,7 +153,12 @@ ifeq ($(uname),Windows) $(move) $(linter_dir)\golangci-lint-$(GOLANGCI_LINT_VERSION)-windows-amd64\golangci-lint.exe $(linter) else mkdir -p $(linter_dir) - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(linter_dir) v$(GOLANGCI_LINT_VERSION) +ifeq ($(uname),Linux) + curl -LsS https://github.com/golangci/golangci-lint/releases/download/v$(GOLANGCI_LINT_VERSION)/golangci-lint-$(GOLANGCI_LINT_VERSION)-linux-amd64.tar.gz | tar zxv --strip=1 -C $(linter_dir) +else + curl -LsS https://github.com/golangci/golangci-lint/releases/download/v$(GOLANGCI_LINT_VERSION)/golangci-lint-$(GOLANGCI_LINT_VERSION)-darwin-amd64.tar.gz | tar zxv --strip=1 -C $(linter_dir) +endif + endif # hugo