circleci: fix install tools (#17)

Author: zchee

.circleci/config.yml

@@ -7,15 +7,15 @@ orbs:
 executors:
   golang:
     docker:
-      - image: golang:1.15-buster
+      - image: golang:1.16-buster
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_PASSWORD
     working_directory: /go/src/go.lsp.dev/protocol
 
 command_vars:
-  - cache_key: &cache_key go-mod-v1-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}
-  - cache_tools_key: &cache_tools_key go-tools-v1-{{ checksum "tools/go.mod" }}-{{ checksum "tools/go.sum" }}
+  - cache_key: &cache_key v1-go-mod-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}
+  - cache_tools_key: &cache_tools_key v1-go-tools-{{ checksum "tools/go.mod" }}-{{ checksum "tools/go.sum" }}
 
 commands:
   restore_dependencies:
@@ -43,7 +43,6 @@ commands:
       - run:
           name: "Download dependency tools"
           command: |
-            find /go/bin/ -mindepth 1 -type f -executable | head -1
             if [ -z $(find ./tools/bin/ -mindepth 1 -type f -executable | head -1) ]; then
               make -j${CPUS} tools
             fi
@@ -132,7 +131,6 @@ jobs:
           name: Run fmt and lint for sources
           command: |
             make lint GO_LINT_FLAGS="$(circleci tests split .circleci/lint-buildtags)" JOBS=${CPUS}
-            git add -N . && git diff --exit-code
       - save_cache:
           name: "Save module cache"
           key: *cache_key

Makefile

@@ -116,15 +116,13 @@ tools/%:  ## install an individual dependent tool
 	@${MAKE} tools/bin/$* 1>/dev/null
 
 tools/bin/%: ${TOOLS_DIR}/go.mod ${TOOLS_DIR}/go.sum
-	@if [ -z '${CI}' ]; then \
-		cd tools; \
-			for t in ${TOOLS}; do \
-				if [ -z '$*' ] || [ $$(basename $$t) = '$*' ]; then \
-					echo "Install $$t ..." >&2; \
-					GOBIN=${TOOLS_BIN} CGO_ENABLED=0 go install -v -mod=mod ${GO_FLAGS} "$${t}"; \
-				fi \
-			done \
-	fi
+	cd tools; \
+		for t in ${TOOLS}; do \
+			if [ -z '$*' ] || [ $$(basename $$t) = '$*' ]; then \
+				echo "Install $$t ..." >&2; \
+				GOBIN=${TOOLS_BIN} CGO_ENABLED=0 go install -v -mod=mod ${GO_FLAGS} "$${t}"; \
+			fi \
+		done
 
 
 ##@ clean