Skip building the linter runner analysis cache if the cache was succe…

…ssfully restored

Signed-off-by: Alper Rifat Ulucinar <[email protected]>

.github/workflows/ci.yml

@@ -73,6 +73,7 @@ jobs:
 
       - name: Cache Linter Analysis
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
+        id: cache-analysis
         with:
           path: ${{ steps.go_cache.outputs.analysis_cache }}
           key: ${{ steps.go_cache.outputs.analysis_cache_key }}
@@ -85,6 +86,5 @@ jobs:
       - name: Lint
         env:
           GOLANGCI_LINT_CACHE: ${{ steps.go_cache.outputs.analysis_cache }}
-        run: |
-          echo ${GOLANGCI_LINT_CACHE} && \
-          make lint
+          SKIP_LINTER_ANALSIS: ${{ steps.cache-analysis.outputs.cache-hit }}
+        run: make lint

Makefile

@@ -313,7 +313,7 @@ go.mod.cachedir:
 	@go env GOMODCACHE
 
 go.lint.analysiskey-interval:
-	@echo golangci-lint.cache-$$(( $$(date +%s) / 604800 ))-
+	@echo -n golangci-lint.cache-$$(( $$(date +%s) / 604800 ))-
 
 go.lint.analysiskey:
 	@echo $$(make go.lint.analysiskey-interval)$$(sha1sum go.mod | cut -d' ' -f1)
@@ -340,5 +340,8 @@ checkout-to-old-api:
 lint.init: build-lint-cache
 
 build-lint-cache: $(GOLANGCILINT)
-	./scripts/tag.sh && \
-	$(GOLANGCILINT) run -v --build-tags ec2,configregistry,configprovider,linter_run -v --concurrency 1
+	@$(INFO) Running golangci-lint with the analysis cache building phase.
+	@(./scripts/tag.sh && \
+	(([[ "${SKIP_LINTER_ANALSIS}" == "true" ]] && echo "Skipping analysis cache build phase because it's already been populated") && \
+	[[ "${SKIP_LINTER_ANALSIS}" == "true" ]] || $(GOLANGCILINT) run -v --build-tags ec2,configregistry,configprovider,linter_run -v --concurrency 1)) || $(FAIL)
+	@$(OK) Running golangci-lint with the analysis cache building phase.