Improve cache logging

This should fix the warnings issued when saving artifact bundles.

action.yml

@@ -38,7 +38,7 @@ inputs:
           ["generated-gradle-jars", "caches/*/generated-gradle-jars/*.jar"],
           ["wrapper-zips", "wrapper/dists/*/*/*.zip"],
           ["dependency-jars", "caches/modules-*/files-*/**/*.jar"],
-          ["instrumented-jars", "caches/jars-*/*"]
+          ["instrumented-jars", "caches/jars-*/*/"]
         ]
 
 outputs:

src/cache-gradle-user-home.ts

@@ -5,7 +5,12 @@ import * as core from '@actions/core'
 import * as glob from '@actions/glob'
 import * as exec from '@actions/exec'
 
-import {AbstractCache, hashFileNames, tryDelete} from './cache-utils'
+import {
+    AbstractCache,
+    getCacheKeyPrefix,
+    hashFileNames,
+    tryDelete
+} from './cache-utils'
 
 // Which paths under Gradle User Home should be cached
 const CACHE_PATH = ['caches', 'notifications']
@@ -73,7 +78,9 @@ export class GradleUserHomeCache extends AbstractCache {
     async beforeSave(): Promise<void> {
         await this.reportGradleUserHomeSize('before saving common artifacts')
         await this.saveArtifactBundles()
-        await this.reportGradleUserHomeSize('after saving common artifacts')
+        await this.reportGradleUserHomeSize(
+            'after saving common artifacts (./wrapper dir is not cached)'
+        )
     }
 
     private async saveArtifactBundles(): Promise<void> {
@@ -96,7 +103,10 @@ export class GradleUserHomeCache extends AbstractCache {
     ): Promise<void> {
         const bundleMetaFile = this.getBundleMetaFile(bundle)
 
-        const globber = await glob.create(artifactPath)
+        const globber = await glob.create(artifactPath, {
+            implicitDescendants: false,
+            followSymbolicLinks: false
+        })
         const bundleFiles = await globber.glob()
 
         // Handle no matching files
@@ -131,7 +141,7 @@ export class GradleUserHomeCache extends AbstractCache {
     }
 
     protected createCacheKey(bundle: string, files: string[]): string {
-        const cacheKeyPrefix = process.env['CACHE_KEY_PREFIX'] || ''
+        const cacheKeyPrefix = getCacheKeyPrefix()
         const relativeFiles = files.map(x =>
             path.relative(this.gradleUserHome, x)
         )
@@ -194,7 +204,7 @@ export class GradleUserHomeCache extends AbstractCache {
             }
         )
 
-        core.info(`Gradle User Home cache entry (directories >5M): ${label}`)
+        core.info(`Gradle User Home (directories >5M): ${label}`)
 
         core.info(
             result.stdout

src/cache-utils.ts

@@ -17,9 +17,13 @@ export function isCacheDebuggingEnabled(): boolean {
     return process.env['CACHE_DEBUG_ENABLED'] ? true : false
 }
 
-function generateCacheKey(cacheName: string): CacheKey {
+export function getCacheKeyPrefix(): string {
     // Prefix can be used to force change all cache keys (defaults to cache protocol version)
-    const cacheKeyPrefix = process.env['CACHE_KEY_PREFIX'] || 'v2-'
+    return process.env['CACHE_KEY_PREFIX'] || 'v2-'
+}
+
+function generateCacheKey(cacheName: string): CacheKey {
+    const cacheKeyPrefix = getCacheKeyPrefix()
 
     // At the most general level, share caches for all executions on the same OS
     const runnerOs = process.env['RUNNER_OS'] || ''

src/caches.ts

@@ -7,7 +7,9 @@ const BUILD_ROOT_DIR = 'BUILD_ROOT_DIR'
 
 export async function restore(buildRootDirectory: string): Promise<void> {
     if (isCacheDisabled()) {
-        core.debug('Cache read disabled')
+        core.info(
+            'Cache is disabled: will not restore state from previous builds.'
+        )
         return
     }
 
@@ -22,7 +24,9 @@ export async function restore(buildRootDirectory: string): Promise<void> {
 
 export async function save(): Promise<void> {
     if (isCacheReadOnly()) {
-        core.debug('Cache is read-only: not saving cache entry')
+        core.info(
+            'Cache is read-only: will not save state for use in subsequent builds.'
+        )
         return
     }