coordinate post and main hashing method

nrwl · Jan 10, 2025 · 63593de · 63593de
1 parent 6845bfb
commit 63593de
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 19 deletions.
diff --git a/workflow-steps/cache/hashing-utils.ts b/workflow-steps/cache/hashing-utils.ts
@@ -63,7 +63,7 @@ export function buildCachePaths(
   inputPaths: string,
   warnInvalidPaths: boolean = true,
 ) {
-  const directories = Array.from(
+  const directories: string[] = Array.from(
     new Set(
       inputPaths
         .split('\n')

diff --git a/workflow-steps/cache/main.ts b/workflow-steps/cache/main.ts
@@ -26,9 +26,14 @@ if (!inputKey || !inputPaths) {
 
 const paths = buildCachePaths(inputPaths, false);
 const stringifiedPaths = paths.join(',');
-const key = hashKey(`${inputKey}|"${stringifiedPaths}"`);
-const currentBranchKeys = [key].map((k) => `${currentBranch}-${k}`);
-const baseBranchKeys = baseBranch ? [key].map((k) => `${baseBranch}-${k}`) : [];
+const key = `${inputKey} | "${stringifiedPaths}"`;
+const hashedKey = hashKey(key);
+const currentBranchKeys = [hashedKey].map((k) => `${currentBranch}-${k}`);
+const baseBranchKeys = baseBranch
+  ? [hashedKey].map((k) => `${baseBranch}-${k}`)
+  : [];
+
+console.log(`Expanded unhashed key is: ${key}\n`);
 
 cacheClient
   .restore(
@@ -38,10 +43,14 @@ cacheClient
   )
   .then((resp: RestoreResponse) => {
     if (resp.success) {
-      console.log('Found cache entry on hashed key: ' + resp.key);
+      console.log('Found cache entry on: ' + resp.key);
       rememberCacheRestorationForPostStep();
     } else {
-      console.log('Cache miss on hashed key: ' + key);
+      console.log(`Cache miss on:`);
+      console.log(`- ${currentBranch}-${hashedKey}`);
+      if (baseBranch && currentBranch !== baseBranch) {
+        console.log(`- ${baseBranch}-${hashedKey}`);
+      }
     }
   });
 

diff --git a/workflow-steps/cache/output/main.js b/workflow-steps/cache/output/main.js
@@ -6041,19 +6041,26 @@ if (!inputKey || !inputPaths) {
 }
 var paths = buildCachePaths(inputPaths, false);
 var stringifiedPaths = paths.join(",");
-var key = hashKey(`${inputKey}|"${stringifiedPaths}"`);
-var currentBranchKeys = [key].map((k) => `${currentBranch}-${k}`);
-var baseBranchKeys = baseBranch ? [key].map((k) => `${baseBranch}-${k}`) : [];
+var key = `${inputKey} | "${stringifiedPaths}"`;
+var hashedKey = hashKey(key);
+var currentBranchKeys = [hashedKey].map((k) => `${currentBranch}-${k}`);
+var baseBranchKeys = baseBranch ? [hashedKey].map((k) => `${baseBranch}-${k}`) : [];
+console.log(`Expanded unhashed key is: ${key}
+`);
 cacheClient.restore(
   new RestoreRequest({
     keys: [...currentBranchKeys, ...baseBranchKeys]
   })
 ).then((resp) => {
   if (resp.success) {
-    console.log("Found cache entry on hashed key: " + resp.key);
+    console.log("Found cache entry on: " + resp.key);
     rememberCacheRestorationForPostStep();
   } else {
-    console.log("Cache miss on hashed key: " + key);
+    console.log(`Cache miss on:`);
+    console.log(`- ${currentBranch}-${hashedKey}`);
+    if (baseBranch && currentBranch !== baseBranch) {
+      console.log(`- ${baseBranch}-${hashedKey}`);
+    }
   }
 });
 function rememberCacheRestorationForPostStep() {

diff --git a/workflow-steps/cache/output/post.js b/workflow-steps/cache/output/post.js
@@ -6028,13 +6028,15 @@ if (!!cacheWasHit) {
   );
   const paths = buildCachePaths(inputPaths);
   const stringifiedPaths = paths.join(",");
-  const key = hashKey(`${inputKey}|${stringifiedPaths}`);
-  console.log("Storing the following directories..\n" + paths.join("\n"));
+  const key = `${inputKey} | "${stringifiedPaths}"`;
+  const hashedKey = hashKey(key);
+  console.log(`Expanded unhashed cache key is: ${key}`);
+  console.log("Storing the following directories:\n" + paths.join("\n"));
   console.log(`
-Using key..${key}`);
+under hash: ${process.env.NX_BRANCH}-${hashedKey}`);
   cacheClient.storeV2(
     new StoreRequest({
-      key,
+      key: hashedKey,
       paths
     })
   ).then((r) => {

diff --git a/workflow-steps/cache/post.ts b/workflow-steps/cache/post.ts
@@ -24,15 +24,17 @@ if (!!cacheWasHit) {
 
   const paths = buildCachePaths(inputPaths);
   const stringifiedPaths = paths.join(',');
-  const key = hashKey(`${inputKey}|${stringifiedPaths}`);
+  const key = `${inputKey} | "${stringifiedPaths}"`;
+  const hashedKey = hashKey(key);
 
-  console.log('Storing the following directories..\n' + paths.join('\n'));
-  console.log(`\nUsing key..${key}`);
+  console.log(`Expanded unhashed cache key is: ${key}`);
+  console.log('Storing the following directories:\n' + paths.join('\n'));
+  console.log(`\nunder hash: ${process.env.NX_BRANCH}-${hashedKey}`);
 
   cacheClient
     .storeV2(
       new StoreRequest({
-        key,
+        key: hashedKey,
         paths,
       }),
     )