mirror of
https://github.com/gradle/gradle-build-action.git
synced 2024-11-22 17:12:51 +00:00
Rename cache.ts to cache-wrapper.ts
This commit is contained in:
parent
692fda9de7
commit
059f2e7791
4 changed files with 10 additions and 10 deletions
|
@ -1,10 +1,10 @@
|
||||||
import * as cache from '../src/cache'
|
import * as cacheWrapper from '../src/cache-wrapper'
|
||||||
import * as path from 'path'
|
import * as path from 'path'
|
||||||
|
|
||||||
describe('cache', () => {
|
describe('cache', () => {
|
||||||
describe('can extract gradle wrapper slug', () => {
|
describe('can extract gradle wrapper slug', () => {
|
||||||
it('from wrapper properties file', async () => {
|
it('from wrapper properties file', async () => {
|
||||||
const version = cache.extractGradleWrapperSlugFrom(
|
const version = cacheWrapper.extractGradleWrapperSlugFrom(
|
||||||
path.resolve(
|
path.resolve(
|
||||||
'__tests__/data/basic/gradle/wrapper/gradle-wrapper.properties'
|
'__tests__/data/basic/gradle/wrapper/gradle-wrapper.properties'
|
||||||
)
|
)
|
||||||
|
@ -12,19 +12,19 @@ describe('cache', () => {
|
||||||
expect(version).toBe('6.5-bin')
|
expect(version).toBe('6.5-bin')
|
||||||
})
|
})
|
||||||
it('for -bin dist', async () => {
|
it('for -bin dist', async () => {
|
||||||
const version = cache.extractGradleWrapperSlugFromDistUri(
|
const version = cacheWrapper.extractGradleWrapperSlugFromDistUri(
|
||||||
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.5-bin.zip'
|
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.5-bin.zip'
|
||||||
)
|
)
|
||||||
expect(version).toBe('6.5-bin')
|
expect(version).toBe('6.5-bin')
|
||||||
})
|
})
|
||||||
it('for -all dist', async () => {
|
it('for -all dist', async () => {
|
||||||
const version = cache.extractGradleWrapperSlugFromDistUri(
|
const version = cacheWrapper.extractGradleWrapperSlugFromDistUri(
|
||||||
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.5-all.zip'
|
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.5-all.zip'
|
||||||
)
|
)
|
||||||
expect(version).toBe('6.5-all')
|
expect(version).toBe('6.5-all')
|
||||||
})
|
})
|
||||||
it('for milestone', async () => {
|
it('for milestone', async () => {
|
||||||
const version = cache.extractGradleWrapperSlugFromDistUri(
|
const version = cacheWrapper.extractGradleWrapperSlugFromDistUri(
|
||||||
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.6-milestone-1-all.zip'
|
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.6-milestone-1-all.zip'
|
||||||
)
|
)
|
||||||
expect(version).toBe('6.6-milestone-1-all')
|
expect(version).toBe('6.6-milestone-1-all')
|
|
@ -2,7 +2,7 @@ import * as core from '@actions/core'
|
||||||
import * as path from 'path'
|
import * as path from 'path'
|
||||||
import {parseArgsStringToArgv} from 'string-argv'
|
import {parseArgsStringToArgv} from 'string-argv'
|
||||||
|
|
||||||
import * as cache from './cache'
|
import * as cacheWrapper from './cache-wrapper'
|
||||||
import * as execution from './execution'
|
import * as execution from './execution'
|
||||||
import * as gradlew from './gradlew'
|
import * as gradlew from './gradlew'
|
||||||
import * as provision from './provision'
|
import * as provision from './provision'
|
||||||
|
@ -41,7 +41,7 @@ async function resolveGradleExecutable(baseDirectory: string): Promise<string> {
|
||||||
const gradleExecutable = inputOrNull('gradle-executable')
|
const gradleExecutable = inputOrNull('gradle-executable')
|
||||||
if (gradleExecutable !== null) {
|
if (gradleExecutable !== null) {
|
||||||
if (gradleExecutable.endsWith(gradlew.wrapperFilename())) {
|
if (gradleExecutable.endsWith(gradlew.wrapperFilename())) {
|
||||||
await cache.restoreCachedWrapperDist(
|
await cacheWrapper.restoreCachedWrapperDist(
|
||||||
path.resolve(gradleExecutable, '..')
|
path.resolve(gradleExecutable, '..')
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ async function resolveGradleExecutable(baseDirectory: string): Promise<string> {
|
||||||
? path.join(baseDirectory, wrapperDirectory)
|
? path.join(baseDirectory, wrapperDirectory)
|
||||||
: baseDirectory
|
: baseDirectory
|
||||||
|
|
||||||
await cache.restoreCachedWrapperDist(gradlewDirectory)
|
await cacheWrapper.restoreCachedWrapperDist(gradlewDirectory)
|
||||||
|
|
||||||
return path.resolve(gradlewDirectory, gradlew.wrapperFilename())
|
return path.resolve(gradlewDirectory, gradlew.wrapperFilename())
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import * as cache from './cache'
|
import * as cacheWrapper from './cache-wrapper'
|
||||||
|
|
||||||
// Invoked by GitHub Actions
|
// Invoked by GitHub Actions
|
||||||
export async function run(): Promise<void> {
|
export async function run(): Promise<void> {
|
||||||
await cache.cacheWrapperDist()
|
await cacheWrapper.cacheWrapperDist()
|
||||||
}
|
}
|
||||||
|
|
||||||
run()
|
run()
|
||||||
|
|
Loading…
Reference in a new issue