From 965c8dbea5199e274081b5400e82b68a8819c9ec Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Sun, 22 Aug 2021 17:02:10 -0600
Subject: [PATCH] Include build arguments in cache keys

Fixes #68
---
 src/cache-configuration.ts | 16 ++++++++++------
 src/cache-dependencies.ts  | 12 ++++++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/cache-configuration.ts b/src/cache-configuration.ts
index 646a885..ebf62bc 100644
--- 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
index b248e0f..d1525eb 100644
--- 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) {