Respect cached files

Signed-off-by: Daichi Sakaue <[email protected]>
cybozu-go · Apr 5, 2024 · ee5c609 · ee5c609
1 parent cbf7e66
commit ee5c609
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
 env:
-  cache-version: 1
+  cache-version: "2024-04-05"
 jobs:
   test:
     name: e2e
@@ -16,13 +16,16 @@ jobs:
         with:
           go-version-file: go.mod
       - name: Cache tools
-        id: cache-tools
         uses: actions/cache@v3
         with:
           path: bin/download
-          key: cache-${{ env.cache-version }}-go-${{ hashFiles('go.mod') }}-${{ hashFiles('Makefile') }}
+          key: cache-tools-${{ env.cache-version }}-go-${{ hashFiles('go.mod') }}-${{ hashFiles('Makefile') }}
+      - name: Cache files
+        uses: actions/cache@v3
+        with:
+          path: cache
+          key: cache-files-${{ env.cache-version }}-go-${{ hashFiles('go.mod') }}-${{ hashFiles('Makefile') }}
       - name: Setup tools
-        if: steps.cache-tools.outputs.cache-hit != 'true'
         run: make setup
       - name: Run lint
         run: make lint

diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,5 @@
 
 # Generated files
 /bin
+/cache
 /docs/book
diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 BIN_DIR := $(shell pwd)/bin
 TOOLS_DIR := $(BIN_DIR)/download
+CACHE_DIR := $(shell pwd)/cache
+
 HELM_VERSION := 3.14.3
 JQ_VERSION := 1.7.1
 KIND_VERSION := 0.22.0
@@ -9,8 +11,10 @@ YQ_VERSION := 4.43.1
 
 # Test tools
 CUSTOMCHECKER := $(TOOLS_DIR)/custom-checker
-HELM := $(TOOLS_DIR)/helm
+HELM_BINARY := $(TOOLS_DIR)/helm
+HELM := $(HELM_BINARY) --repository-cache $(CACHE_DIR)/helm/repository --repository-config $(CACHE_DIR)/helm/repositories.yaml
 JQ := $(TOOLS_DIR)/jq
+KIND := $(TOOLS_DIR)/kind
 KUBECTL := $(TOOLS_DIR)/kubectl
 KUSTOMIZE := $(TOOLS_DIR)/kustomize
 STATICCHECK := $(TOOLS_DIR)/staticcheck
@@ -26,39 +30,48 @@ help: ## Display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 .PHONY: setup
-setup: $(HELM) $(JQ) $(KUBECTL) $(KUSTOMIZE) $(YQ) ## Install necessary tools
-	GOBIN=$(TOOLS_DIR) go install sigs.k8s.io/kind@v$(KIND_VERSION)
-	GOBIN=$(TOOLS_DIR) go install honnef.co/go/tools/cmd/staticcheck@latest
-	GOBIN=$(TOOLS_DIR) go install github.com/cybozu-go/golang-custom-analyzer/cmd/custom-checker@latest
+setup: $(CUSTOMCHECKER) $(HELM_BINARY) $(KIND) $(JQ) $(KUBECTL) $(KUSTOMIZE) $(STATICCHECK) $(YQ) ## Install necessary tools
 	$(HELM) repo add cilium https://helm.cilium.io/
 	$(HELM) repo update cilium
 
-$(TOOLS_DIR):
-	mkdir -p $(TOOLS_DIR)
+$(CUSTOMCHECKER):
+	GOBIN=$(TOOLS_DIR) go install github.com/cybozu-go/golang-custom-analyzer/cmd/custom-checker@latest
 
-$(HELM): $(TOOLS_DIR)
+$(HELM_BINARY):
+	mkdir -p $(TOOLS_DIR)
 	wget -qO - https://get.helm.sh/helm-v$(HELM_VERSION)-linux-amd64.tar.gz | tar zx -O linux-amd64/helm > $@
 	chmod +x $@
 
-$(JQ): $(TOOLS_DIR)
+$(JQ):
+	mkdir -p $(TOOLS_DIR)
 	wget -qO $@ https://github.com/jqlang/jq/releases/download/jq-$(JQ_VERSION)/jq-linux-amd64
 	chmod +x $@
 
-$(KUBECTL): $(TOOLS_DIR)
+$(KIND):
+	GOBIN=$(TOOLS_DIR) go install sigs.k8s.io/kind@v$(KIND_VERSION)
+
+$(KUBECTL):
+	mkdir -p $(TOOLS_DIR)
 	wget -qO $@ https://storage.googleapis.com/kubernetes-release/release/v$(KUBECTL_VERSION)/bin/linux/amd64/kubectl
 	chmod +x $@
 
-$(KUSTOMIZE): $(TOOLS_DIR)
+$(KUSTOMIZE):
+	mkdir -p $(TOOLS_DIR)
 	wget -qO - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv$(KUSTOMIZE_VERSION)/kustomize_v$(KUSTOMIZE_VERSION)_linux_amd64.tar.gz | tar zx -O kustomize > $@
 	chmod +x $@
 
-$(YQ): $(TOOLS_DIR)
+$(STATICCHECK):
+	GOBIN=$(TOOLS_DIR) go install honnef.co/go/tools/cmd/staticcheck@latest
+
+$(YQ):
+	mkdir -p $(TOOLS_DIR)
 	wget -qO $@ https://github.com/mikefarah/yq/releases/download/v$(YQ_VERSION)/yq_linux_amd64
 	chmod +x $@
 
 .PHONY: clean
 clean:
 	rm -rf $(BIN_DIR)
+	rm -rf $(CACHE_DIR)
 
 ##@ Development
 

diff --git a/e2e/Makefile b/e2e/Makefile
@@ -2,8 +2,10 @@ CILIUM_VERSION := 1.15.3
 
 BIN_DIR := $(shell pwd)/../bin
 TOOLS_DIR := $(BIN_DIR)/download
+CACHE_DIR := $(shell pwd)/../cache
+
 CILIUM_POLICY := $(BIN_DIR)/cilium-policy
-HELM := $(TOOLS_DIR)/helm
+HELM := $(TOOLS_DIR)/helm --repository-cache $(CACHE_DIR)/helm/repository --repository-config $(CACHE_DIR)/helm/repositories.yaml
 KIND := $(TOOLS_DIR)/kind
 KUBECTL := $(TOOLS_DIR)/kubectl
 KUSTOMIZE := $(TOOLS_DIR)/kustomize
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,5 @@ @@
     # Generated files
     /bin
+    /cache
     /docs/book