Use a unique disk cache key for each workflow run

Author: calebzulawski

index.js

@@ -26,7 +26,7 @@ async function setupBazel() {
 
   await setupBazelisk()
   await restoreCache(config.bazeliskCache)
-  await restoreCache(config.diskCache)
+  await restoreDiskCache(config.diskCache)
   await restoreCache(config.repositoryCache)
   await restoreExternalCaches(config.externalCache)
 
@@ -143,7 +143,7 @@ async function restoreExternalCaches(cacheConfig) {
   }
 }
 
-async function restoreCache(cacheConfig) {
+async function restoreCacheImpl(cacheConfig, primaryKey, restoreKeys) {
   if (!cacheConfig.enabled) {
     return
   }
@@ -152,16 +152,13 @@ async function restoreCache(cacheConfig) {
   await setTimeout(delay, async function () {
     core.startGroup(`Restore cache for ${cacheConfig.name}`)
 
-    const hash = await glob.hashFiles(cacheConfig.files.join('\n'))
     const name = cacheConfig.name
     const paths = cacheConfig.paths
-    const restoreKey = `${config.baseCacheKey}-${name}-`
-    const key = `${restoreKey}${hash}`
 
     core.debug(`Attempting to restore ${name} cache from ${key}`)
 
     const restoredKey = await cache.restoreCache(
-      paths, key, [restoreKey],
+      paths, primaryKey, restoreKeys,
       { segmentTimeoutInMs: 300000 } // 5 minutes
     )
 
@@ -179,4 +176,22 @@ async function restoreCache(cacheConfig) {
   }())
 }
 
+async function restoreCache(cacheConfig) {
+  const hash = await glob.hashFiles(cacheConfig.files.join('\n'))
+  const restoreKey = `${config.baseCacheKey}-${cacheConfig.name}-`
+  const key = `${restoreKey}${hash}`
+  await restoreCacheImpl(cacheConfig, key, [restoreKey])
+}
+
+async function restoreDiskCache(cacheConfig) {
+  const hash = await glob.hashFiles(cacheConfig.files.join('\n'))
+
+  // Since disk caches get updated on any change, each run has a unique key.
+  // Therefore it can only be restored by prefix match, rather than exact key match.
+  // When multiple prefix matches exist, the most recent is selected.
+  const restoreKey = `${config.baseCacheKey}-${cacheConfig.name}-`
+  const hashedRestoreKey = `${restoreKey}${hash}-`
+  await restoreCacheImpl(cacheConfig, hashedRestoreKey, [hashedRestoreKey, restoreKey])
+}
+
 run()

post.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const cache = require('@actions/cache')
 const core = require('@actions/core')
+const github = require('@actions/github')
 const glob = require('@actions/glob')
 const config = require('./config')
 const gc = require('./gc')
@@ -80,7 +81,7 @@ async function saveDiskCache(cacheConfig) {
       // We don't want to follow symlinks as it's extremely slow on macOS.
       { followSymbolicLinks: false }
     )
-    const key = `${config.baseCacheKey}-${cacheConfig.name}-${hash}`
+    const key = `${config.baseCacheKey}-${cacheConfig.name}-${hash}-${github.context.run_id}.${github.context.run_attempt}`
     core.debug(`Attempting to save ${paths} cache to ${key}`)
     await cache.saveCache(paths, key)
     core.info('Successfully saved cache')