mirror of
https://github.com/gradle/gradle-build-action.git
synced 2024-11-22 17:12:51 +00:00
Extract cache key generation into common function
This commit is contained in:
parent
0ecbac99f3
commit
d7ed6d7e8d
3 changed files with 42 additions and 34 deletions
|
@ -4,11 +4,10 @@ import os from 'os'
|
|||
|
||||
import * as core from '@actions/core'
|
||||
import * as cache from '@actions/cache'
|
||||
import * as github from '@actions/github'
|
||||
import {
|
||||
generateCacheKey,
|
||||
isCacheReadEnabled,
|
||||
isCacheSaveEnabled,
|
||||
truncateArgs
|
||||
isCacheSaveEnabled
|
||||
} from './cache-utils'
|
||||
|
||||
const CACHE_NAME = 'gradle-user-home'
|
||||
|
@ -28,21 +27,15 @@ export async function restore(): Promise<void> {
|
|||
return
|
||||
}
|
||||
|
||||
const cacheKeySeed = process.env[`CACHE_KEY_SEED`] || ''
|
||||
const runnerOs = process.env[`RUNNER_OS`] || ''
|
||||
const cacheKeyPrefix = `${cacheKeySeed}${runnerOs}|gradle|`
|
||||
const cacheKey = generateCacheKey('gradle')
|
||||
|
||||
const args = truncateArgs(core.getInput('arguments'))
|
||||
const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
|
||||
core.saveState(CACHE_KEY, cacheKey.key)
|
||||
|
||||
const cacheKey = `${cacheKeyWithArgs}${github.context.sha}`
|
||||
|
||||
core.saveState(CACHE_KEY, cacheKey)
|
||||
|
||||
const cacheResult = await cache.restoreCache(CACHE_PATH, cacheKey, [
|
||||
cacheKeyWithArgs,
|
||||
cacheKeyPrefix
|
||||
])
|
||||
const cacheResult = await cache.restoreCache(
|
||||
CACHE_PATH,
|
||||
cacheKey.key,
|
||||
cacheKey.restoreKeys
|
||||
)
|
||||
|
||||
if (!cacheResult) {
|
||||
core.info(
|
||||
|
|
|
@ -3,11 +3,10 @@ import fs from 'fs'
|
|||
|
||||
import * as core from '@actions/core'
|
||||
import * as cache from '@actions/cache'
|
||||
import * as github from '@actions/github'
|
||||
import {
|
||||
generateCacheKey,
|
||||
isCacheReadEnabled,
|
||||
isCacheSaveEnabled,
|
||||
truncateArgs
|
||||
isCacheSaveEnabled
|
||||
} from './cache-utils'
|
||||
|
||||
const CACHE_NAME = 'project-dot-gradle'
|
||||
|
@ -27,21 +26,14 @@ export async function restore(rootDir: string): Promise<void> {
|
|||
return
|
||||
}
|
||||
|
||||
const cacheKeySeed = process.env[`CACHE_KEY_SEED`] || ''
|
||||
const runnerOs = process.env[`RUNNER_OS`] || ''
|
||||
const cacheKeyPrefix = `${cacheKeySeed}${runnerOs}|project|`
|
||||
const cacheKey = generateCacheKey('project')
|
||||
|
||||
const args = truncateArgs(core.getInput('arguments'))
|
||||
const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
|
||||
|
||||
const cacheKey = `${cacheKeyWithArgs}${github.context.sha}`
|
||||
|
||||
core.saveState(CACHE_KEY, cacheKey)
|
||||
core.saveState(CACHE_KEY, cacheKey.key)
|
||||
|
||||
const cacheResult = await cache.restoreCache(
|
||||
getCachePath(rootDir),
|
||||
cacheKey,
|
||||
[cacheKeyWithArgs, cacheKeyPrefix]
|
||||
cacheKey.key,
|
||||
cacheKey.restoreKeys
|
||||
)
|
||||
|
||||
if (!cacheResult) {
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
import * as core from '@actions/core'
|
||||
|
||||
export function truncateArgs(args: string): string {
|
||||
return args.trim().replace(/\s+/g, ' ').substr(0, 400)
|
||||
}
|
||||
import * as github from '@actions/github'
|
||||
|
||||
export function isCacheReadEnabled(cacheName: string): boolean {
|
||||
const configValue = getCacheEnabledValue(cacheName)
|
||||
|
@ -26,3 +23,29 @@ function getCacheEnabledValue(cacheName: string): string {
|
|||
`Invalid cache-enabled parameter '${configValue}'. Valid values are ['true', 'false', 'read-only']`
|
||||
)
|
||||
}
|
||||
|
||||
export function generateCacheKey(cacheName: string): CacheKey {
|
||||
const cacheKeySeed = process.env[`CACHE_KEY_SEED`] || ''
|
||||
const runnerOs = process.env[`RUNNER_OS`] || ''
|
||||
const cacheKeyPrefix = `${cacheKeySeed}${runnerOs}|${cacheName}|`
|
||||
|
||||
const args = truncateArgs(core.getInput('arguments'))
|
||||
const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
|
||||
|
||||
const cacheKey = `${cacheKeyWithArgs}${github.context.sha}`
|
||||
return new CacheKey(cacheKey, [cacheKeyWithArgs, cacheKeyPrefix])
|
||||
}
|
||||
|
||||
function truncateArgs(args: string): string {
|
||||
return args.trim().replace(/\s+/g, ' ').substr(0, 400)
|
||||
}
|
||||
|
||||
export class CacheKey {
|
||||
key: string
|
||||
restoreKeys: string[]
|
||||
|
||||
constructor(key: string, restoreKeys: string[]) {
|
||||
this.key = key
|
||||
this.restoreKeys = restoreKeys
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue