Merge pull request #183 from wtto00/cache-key

fix: some minor repairs
amyu · Oct 3, 2023 · 5732c54 · 5732c54
2 parents 2fdb21d + 630e375
commit 5732c54
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -144,7 +144,7 @@ jobs:
       - name: Setup Android SDK
         uses: ./
         with:
-          cache-key: 'default-version'
+          cache-key: custom-cache-key-on-${{matrix.os}}
 
       - run: |
           sdkmanager --install emulator
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ steps:
       # Whether to use the cache
       cache-disabled: true
 
-      # default: `${sdkVersion}-${buildToolsVersion}-${ndkVersion}-${cmakeVersion}-v3.1`
+      # default: `${sdkVersion}-${buildToolsVersion}-${ndkVersion}-${cmakeVersion}-v3.2`
       # Custom key for cache. It is invalid when `cache-disabled: true`
       cache-key: 'custom-cache-key'
 

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/src/cache.ts b/src/cache.ts
@@ -13,7 +13,7 @@ function generateRestoreKey(
   cacheKey: string
 ): string {
   if (cacheKey) return cacheKey
-  return `${sdkVersion}-${buildToolsVersion}-${ndkVersion}-${cmakeVersion}-v3.1`
+  return `${sdkVersion}-${buildToolsVersion}-${ndkVersion}-${cmakeVersion}-v3.2`
 }
 
 export async function restoreCache(
@@ -33,9 +33,9 @@ export async function restoreCache(
 
   const restoredEntry = await cache.restoreCache([ANDROID_HOME_DIR], restoreKey)
   if (restoredEntry) {
-    core.info(`Found in cache: ${restoredEntry}`)
+    core.info(`Found in cache: ${restoreKey}`)
   } else {
-    core.info(`Not Found cache: ${restoredEntry}`)
+    core.info(`Not Found cache: ${restoreKey}`)
   }
   core.saveState(RESTORED_ENTRY_STATE_KEY, restoredEntry)
   return Promise.resolve(restoredEntry)

diff --git a/src/installer.ts b/src/installer.ts
@@ -28,7 +28,7 @@ export async function getAndroidSdk(
       cacheKey
     )
     if (restoreCacheEntry) {
-      core.info(`cache hit: ${restoreCacheEntry}`)
+      core.info(`cache hit: ${restoreCacheEntry.key}`)
       return Promise.resolve()
     }
   }