TECH-13067: skaffold cache fixes

goes-funky · Dec 1, 2022 · 53f7acf · 53f7acf
1 parent dd2d22e
commit 53f7acf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/.github/workflows/deploy-git-flow.yaml b/.github/workflows/deploy-git-flow.yaml
@@ -164,7 +164,10 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.skaffold/cache
-          key: ${{ runner.os }}-skaffold
+          key: ${{ runner.os }}-skaffold-${{ github.sha }}
+          restore-keys: |-
+            ${{ runner.os }}-skaffold-${{ github.sha }}
+            ${{ runner.os }}-skaffold
       - uses: actions/download-artifact@v3
         if: inputs.dist-artifact
         with:

diff --git a/.github/workflows/deploy-integration.yaml b/.github/workflows/deploy-integration.yaml
@@ -415,7 +415,10 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.skaffold/cache
-          key: ${{ runner.os }}-skaffold
+          key: ${{ runner.os }}-skaffold-${{ github.sha }}
+          restore-keys: |-
+            ${{ runner.os }}-skaffold-${{ github.sha }}
+            ${{ runner.os }}-skaffold
       - name: Download artifact
         uses: actions/download-artifact@v3
         if: inputs.dist-artifact

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -159,7 +159,10 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.skaffold/cache
-          key: ${{ runner.os }}-skaffold
+          key: ${{ runner.os }}-skaffold-${{ github.sha }}
+          restore-keys: |-
+            ${{ runner.os }}-skaffold-${{ github.sha }}
+            ${{ runner.os }}-skaffold
       - uses: actions/download-artifact@v3
         if: inputs.dist-artifact
         with:

diff --git a/pkg/common/deploy-integration.cue b/pkg/common/deploy-integration.cue
@@ -158,14 +158,7 @@ import "list"
 						path: "./code"
 					}
 				},
-				{
-					name: "Setup skaffold cache"
-					uses: "actions/cache@v3"
-					with: {
-						path: "~/.skaffold/cache"
-						key:  "${{ runner.os }}-skaffold"
-					}
-				},
+				#with.skaffold_cache.step,
 				{
 					name: "Download artifact"
 					uses: "actions/download-artifact@v3"

diff --git a/pkg/common/deploy.cue b/pkg/common/deploy.cue
@@ -90,14 +90,7 @@ import "list"
 				path: "./code"
 			}
 		},
-		{
-			name: "Setup skaffold cache"
-			uses: "actions/cache@v3"
-			with: {
-				path: "~/.skaffold/cache"
-				key:  "${{ runner.os }}-skaffold"
-			}
-		},
+		#with.skaffold_cache.step,
 		{
 			uses: "actions/download-artifact@v3"
 			if:   "inputs.dist-artifact"

diff --git a/pkg/common/steps.cue b/pkg/common/steps.cue
@@ -148,4 +148,18 @@ package common
     		}
     	}
     }
+    skaffold_cache: {
+        step: #step & {
+            name: "Setup skaffold cache"
+            uses: "actions/cache@v3"
+            with: {
+                path: "~/.skaffold/cache"
+                key:  "${{ runner.os }}-skaffold-${{ github.sha }}"
+                "restore-keys": """
+                    ${{ runner.os }}-skaffold-${{ github.sha }}
+                    ${{ runner.os }}-skaffold
+                    """
+            }
+        }
+    }
 }