actions/gradle-build-action
1
0
Fork 0
mirror of https://github.com/gradle/gradle-build-action.git synced 2024-10-06 02:34:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup code to resolve Gradle wrapper script

Browse source
This commit is contained in:
Daz DeBoer 2021-09-07 14:38:41 -06:00
parent 378bd0b6f8
commit d20d631365
No known key found for this signature in database
GPG key ID: DD6B9F0B06683D5D
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gradlew.ts
View file

@ -3,7 +3,7 @@ import fs from 'fs'
const IS_WINDOWS = process.platform === 'win32'
export function wrapperFilename(): string {
export function wrapperScriptFilename(): string {
return IS_WINDOWS ? 'gradlew.bat' : 'gradlew'
}
@ -11,9 +11,14 @@ export function installScriptFilename(): string {
return IS_WINDOWS ? 'gradle.bat' : 'gradle'
}
export function validateGradleWrapper(gradlewDirectory: string): void {
export function locateGradleWrapperScript(buildRootDirectory: string): string {
validateGradleWrapper(buildRootDirectory)
return path.resolve(buildRootDirectory, wrapperScriptFilename())
}
function validateGradleWrapper(buildRootDirectory: string): void {
const wrapperProperties = path.resolve(
gradlewDirectory,
buildRootDirectory,
'gradle/wrapper/gradle-wrapper.properties'
)
if (!fs.existsSync(wrapperProperties)) {

9
src/main.ts
View file

@ -59,14 +59,7 @@ async function resolveGradleExecutable(
return path.resolve(workspaceDirectory, gradleExecutable)
}
const wrapperDirectory = core.getInput('wrapper-directory')
const gradlewDirectory =
wrapperDirectory !== ''
? path.resolve(workspaceDirectory, wrapperDirectory)
: buildRootDirectory
gradlew.validateGradleWrapper(gradlewDirectory)
return path.resolve(gradlewDirectory, gradlew.wrapperFilename())
return gradlew.locateGradleWrapperScript(buildRootDirectory)
}
function resolveBuildRootDirectory(baseDirectory: string): string {