Distinguish cache and tools-cache in log message (#282)

eifinger · Jul 4, 2024 · 957d97b · 957d97b
1 parent 7a63de0
commit 957d97b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/dist/save-cache/index.js b/dist/save-cache/index.js
diff --git a/dist/save-cache/index.js.map b/dist/save-cache/index.js.map
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/dist/setup/index.js.map b/dist/setup/index.js.map
diff --git a/src/restore-cache.ts b/src/restore-cache.ts
@@ -28,7 +28,7 @@ export async function restoreCache(
   }
 
   let matchedKey: string | undefined
-  core.info(`Trying to restore cache with key: ${cacheKey}`)
+  core.info(`Trying to restore .venv from cache with key: ${cacheKey}`)
   try {
     matchedKey = cacheLocalStoragePath
       ? await restoreCacheLocal(cacheKey)
@@ -63,10 +63,14 @@ function handleMatchResult(
 ): void {
   if (matchedKey) {
     core.saveState(STATE_CACHE_MATCHED_KEY, matchedKey)
-    core.info(`Cache restored from key: ${matchedKey}`)
+    core.info(
+      `.venv restored from${cacheLocalStoragePath ? ' local' : ''} cache with key: ${matchedKey}`
+    )
     core.setOutput('cache-hit', true)
   } else {
-    core.info(`No cache found for key: ${primaryKey}`)
+    core.info(
+      `No${cacheLocalStoragePath ? ' local' : ''} cache found for key: ${primaryKey}`
+    )
     core.setOutput('cache-hit', false)
   }
 }

diff --git a/src/save-cache.ts b/src/save-cache.ts
@@ -42,19 +42,19 @@ async function saveCache(): Promise<void> {
   const matchedKey = core.getState(STATE_CACHE_MATCHED_KEY)
 
   if (!cacheKey) {
-    core.warning('Error retrieving key from state.')
+    core.warning('Error retrieving cache key from state.')
     return
   } else if (matchedKey === cacheKey) {
     // no change in target directories
-    core.info(`Cache hit occurred on key ${cacheKey}, not saving cache.`)
+    core.info(`Cache hit occurred on key ${cacheKey}, not saving .venv.`)
     return
   }
   core.info(`Saving .venv path: ${venvPath}`)
   cacheLocalStoragePath
     ? await saveCacheLocal(cacheKey)
     : await cache.saveCache([venvPath], cacheKey)
 
-  core.info(`Cache saved with the key: ${cacheKey}`)
+  core.info(`.venv saved with the key: ${cacheKey}`)
 }
 
 async function saveCacheLocal(cacheKey: string): Promise<void> {

diff --git a/src/setup-rye.ts b/src/setup-rye.ts
@@ -86,7 +86,7 @@ async function setupRye(
     version = versionInput
     installedPath = tryGetFromCache(arch, versionInput)
     if (installedPath) {
-      core.info(`Found Rye in cache for ${versionInput}`)
+      core.info(`Found Rye in tools-cache for ${versionInput}`)
       return {version, installedPath}
     }
     downloadPath = await downloadVersion(