tianzixuan/gradle-build-action
1
0
Fork 0
mirror of https://github.com/gradle/gradle-build-action.git synced 2025-10-21 00:08:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate error handling for cache restore/save

Browse Source
This commit is contained in:
Daz DeBoer
2021-09-14 13:30:23 -06:00
parent bd08e7b7cd
commit decca791c5
2 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/cache-gradle-user-home.ts
View File

@@ -3,7 +3,6 @@ import fs from 'fs'
import os from 'os'
import * as core from '@actions/core'
import * as glob from '@actions/glob'
import * as cache from '@actions/cache'
import * as exec from '@actions/exec'
import {AbstractCache} from './cache-utils'
@@ -72,22 +71,13 @@ export class GradleUserHomeCache extends AbstractCache {
const key = path.relative(this.getGradleUserHome(), artifactFile)
const cacheKey = `gradle-artifact-${key}`
try {
const restoreKey = await cache.restoreCache(
[artifactFile],
cacheKey
const restoreKey = await this.restoreCache([artifactFile], cacheKey)
if (restoreKey) {
this.debug(`Restored ${cacheKey} from cache to ${artifactFile}`)
} else {
this.debug(
`Failed to restore from ${cacheKey} to ${artifactFile}`
)
if (restoreKey) {
this.debug(
`Restored ${cacheKey} from cache to ${artifactFile}`
)
} else {
core.warning(
`Failed to restore from ${cacheKey} to ${artifactFile}`
)
}
} catch (error) {
core.warning(`Error restoring ${cacheKey}: ${error}`)
}
} else {
this.debug(
@@ -164,21 +154,7 @@ export class GradleUserHomeCache extends AbstractCache {
const cacheKey = `gradle-artifact-${filePath}`
this.debug(`Caching ${artifactFile} with cache key: ${cacheKey}`)
try {
await cache.saveCache([artifactFile], cacheKey)
} catch (error) {
// Fail on validation errors or non-errors (the latter to keep Typescript happy)
if (error instanceof cache.ValidationError) {
throw error
} else if (error instanceof cache.ReserveCacheError) {
// These are expected if the artifact is already cached
this.debug(error.message)
} else if (error instanceof Error) {
core.warning(error.message)
} else {
core.warning(`${error}`)
}
}
await this.saveCache([artifactFile], cacheKey)
// Write the marker file that will stand in place of the original
fs.writeFileSync(markerFile, 'cached')