actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

Address review comments

pull/1268/head
Sampark Sharma 2022-11-15 11:04:24 +00:00 committed by GitHub
parent aaac0e6c98
commit b9d1dd898e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/cache/src/internal/cacheHttpClient.ts vendored
View File

@ -115,7 +115,7 @@ export async function getCacheEntry(
const cacheDownloadUrl = cacheResult?.archiveLocation const cacheDownloadUrl = cacheResult?.archiveLocation
if (!cacheDownloadUrl) { if (!cacheDownloadUrl) {
// List cache for primary key only if cache miss occurs // List cache for primary key only if cache miss occurs
await listCache(keys[0], httpClient, version) await listCache(keys[0], httpClient, version, cacheResult?.scope)
throw new Error('Cache not found.') throw new Error('Cache not found.')
} }
core.setSecret(cacheDownloadUrl) core.setSecret(cacheDownloadUrl)
@ -128,7 +128,8 @@ export async function getCacheEntry(
async function listCache( async function listCache(
key: string, key: string,
httpClient: HttpClient, httpClient: HttpClient,
version: string version: string,
scope?: string
): Promise<void> { ): Promise<void> {
const resource = `caches?key=${encodeURIComponent(key)}` const resource = `caches?key=${encodeURIComponent(key)}`
const response = await retryTypedResponse('listCache', async () => const response = await retryTypedResponse('listCache', async () =>
@ -139,7 +140,7 @@ async function listCache(
const totalCount = cacheListResult?.totalCount const totalCount = cacheListResult?.totalCount
if (totalCount && totalCount > 0) { if (totalCount && totalCount > 0) {
core.info( core.info(
`Cache miss occurred on the cache key '${key}' and version '${version} but there is ${totalCount} existing version of the cache for this key. More info on versioning can be found here: https://github.com/actions/cache#cache-version` `No matching cache found for cache key '${key}', version '${version} and scope ${scope} but there is ${totalCount} existing version of the cache for this key. More info on versioning can be found here: https://github.com/actions/cache#cache-version`
) )
core.debug(`Other versions are as follows:`) core.debug(`Other versions are as follows:`)
cacheListResult?.artifactCaches?.forEach(cacheEntry => { cacheListResult?.artifactCaches?.forEach(cacheEntry => {