Include Gradle invocation arguments in cache keys (#69)

This permits a new cache entry to be persisted when a subsequent Gradle invocation does more work that an earlier invocation. Fixes #68
gradle · Aug 22, 2021 · e0c2736 · e0c2736
1 parent a63892c
commit e0c2736
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/src/cache-configuration.ts b/src/cache-configuration.ts
@@ -1,5 +1,5 @@
-import path from 'path'
-import fs from 'fs'
+import * as path from 'path'
+import * as fs from 'fs'
 
 import * as core from '@actions/core'
 import * as cache from '@actions/cache'
@@ -32,17 +32,21 @@ export async function restoreCachedConfiguration(
     core.saveState(CONFIGURATION_CACHE_PATH, cachePath)
 
     const inputCacheExact = core.getBooleanInput('configuration-cache-exact')
-    const cacheKeyGlobs = inputCacheKeyGlobs('configuration-cache-key')
+    const cacheKeyPrefix = 'configuration|'
+
+    const args = core.getInput('arguments')
+    const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
 
+    const cacheKeyGlobs = inputCacheKeyGlobs('configuration-cache-key')
     const hash = await crypto.hashFiles(rootDir, cacheKeyGlobs)
-    const cacheKeyPrefix = 'configuration-'
-    const cacheKey = `${cacheKeyPrefix}${hash}`
+    const cacheKey = `${cacheKeyWithArgs}${hash}`
+
     core.saveState(CONFIGURATION_CACHE_KEY, cacheKey)
 
     const cacheResult = await cache.restoreCache(
         [cachePath],
         cacheKey,
-        inputCacheExact ? [] : [cacheKeyPrefix]
+        inputCacheExact ? [] : [cacheKeyWithArgs, cacheKeyPrefix]
     )
 
     if (!cacheResult) {

diff --git a/src/cache-dependencies.ts b/src/cache-dependencies.ts
@@ -21,17 +21,21 @@ export async function restoreCachedDependencies(
     core.saveState(DEPENDENCIES_CACHE_PATH, cachePath)
 
     const inputCacheExact = core.getBooleanInput('dependencies-cache-exact')
-    const cacheKeyGlobs = inputCacheKeyGlobs('dependencies-cache-key')
+    const cacheKeyPrefix = 'dependencies|'
+
+    const args = core.getInput('arguments')
+    const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
 
+    const cacheKeyGlobs = inputCacheKeyGlobs('dependencies-cache-key')
     const hash = await crypto.hashFiles(rootDir, cacheKeyGlobs)
-    const cacheKeyPrefix = 'dependencies-'
-    const cacheKey = `${cacheKeyPrefix}${hash}`
+    const cacheKey = `${cacheKeyWithArgs}${hash}`
+
     core.saveState(DEPENDENCIES_CACHE_KEY, cacheKey)
 
     const cacheResult = await cache.restoreCache(
         [cachePath],
         cacheKey,
-        inputCacheExact ? [] : [cacheKeyPrefix]
+        inputCacheExact ? [] : [cacheKeyWithArgs, cacheKeyPrefix]
     )
 
     if (!cacheResult) {