Simplify setting caches to disabled or read-only

This commit is contained in:
Daz DeBoer 2021-09-12 14:26:38 -06:00
parent 1c72a31463
commit 3390540145
No known key found for this signature in database
GPG key ID: DD6B9F0B06683D5D
6 changed files with 24 additions and 39 deletions

View file

@ -7,7 +7,7 @@ import * as cache from '@actions/cache'
import * as toolCache from '@actions/tool-cache'
import * as gradlew from './gradlew'
import {isCacheReadEnabled, isCacheSaveEnabled} from './cache-utils'
import {isCacheDisabled, isCacheReadOnly} from './cache-utils'
const gradleVersionsBaseUrl = 'https://services.gradle.org/versions'
@ -120,7 +120,7 @@ async function downloadAndCacheGradleDistribution(
`gradle-installations/downloads/gradle-${versionInfo.version}-bin.zip`
)
if (!isCacheReadEnabled('distributions')) {
if (isCacheDisabled()) {
await downloadGradleDistribution(versionInfo, downloadPath)
return downloadPath
}
@ -138,7 +138,7 @@ async function downloadAndCacheGradleDistribution(
)
await downloadGradleDistribution(versionInfo, downloadPath)
if (isCacheSaveEnabled('distributions')) {
if (!isCacheReadOnly()) {
try {
await cache.saveCache([downloadPath], cacheKey)
} catch (error) {