Usability improvements:

- Include bundle name in cache key - Emit a few more messages at 'info'
gradle · Sep 15, 2021 · bebb162 · bebb162
1 parent 6084a4e
commit bebb162
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/dist/post/index.js.map b/dist/post/index.js.map
diff --git a/src/cache-gradle-user-home.ts b/src/cache-gradle-user-home.ts
@@ -53,7 +53,7 @@ export class GradleUserHomeCache extends AbstractCache {
             const cacheKey = fs.readFileSync(cacheMetaFile, 'utf-8').trim()
             const restoreKey = await this.restoreCache([pattern], cacheKey)
             if (restoreKey) {
-                this.debug(
+                core.info(
                     `Restored ${bundle} with key ${cacheKey} to ${pattern}`
                 )
             } else {
@@ -149,14 +149,17 @@ export class GradleUserHomeCache extends AbstractCache {
         const previouslyRestoredKey = fs.existsSync(cacheMetaFile)
             ? fs.readFileSync(cacheMetaFile, 'utf-8').trim()
             : ''
-        const cacheKey = this.createCacheKey(hashStrings(commonArtifactFiles))
+        const cacheKey = this.createCacheKey(
+            bundle,
+            hashStrings(commonArtifactFiles)
+        )
 
         if (previouslyRestoredKey === cacheKey) {
             this.debug(
                 `No change to previously restored ${bundle}. Not caching.`
             )
         } else {
-            this.debug(`Caching ${bundle} with cache key: ${cacheKey}`)
+            core.info(`Caching ${bundle} with cache key: ${cacheKey}`)
             await this.saveCache([pattern], cacheKey)
 
             this.debug(`Writing cache metafile: ${cacheMetaFile}`)
@@ -168,9 +171,9 @@ export class GradleUserHomeCache extends AbstractCache {
         }
     }
 
-    protected createCacheKey(key: string): string {
+    protected createCacheKey(bundle: string, key: string): string {
         const cacheKeyPrefix = process.env['CACHE_KEY_PREFIX'] || ''
-        return `${cacheKeyPrefix}${key}`
+        return `${cacheKeyPrefix}${bundle}-${key}`
     }
 
     protected getGradleUserHome(): string {

diff --git a/src/cache-utils.ts b/src/cache-utils.ts
@@ -107,7 +107,7 @@ export abstract class AbstractCache {
         core.saveState(this.cacheResultStateKey, cacheResult)
 
         core.info(
-            `${this.cacheDescription} restored from cache key: ${cacheResult}`
+            `Restored ${this.cacheDescription} from cache key: ${cacheResult}`
         )
 
         await this.afterRestore()