gradle/gradle-build-action
1
0
Fork 0
mirror of https://github.com/gradle/gradle-build-action.git synced 2025-04-05 21:04:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Look for wrapper in build-root-directory by default

Browse source
This commit is contained in:
Daz DeBoer 2021-06-09 12:04:15 -06:00
parent 504653fbf0
commit 89d3624c78
No known key found for this signature in database
GPG key ID: 70F584A28F2230E8
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/main/index.js vendored
View file

File diff suppressed because one or more lines are too long

21
src/main.ts
View file

@ -11,11 +11,15 @@ import * as provision from './provision'
// Invoked by GitHub Actions // Invoked by GitHub Actions
export async function run(): Promise<void> { export async function run(): Promise<void> {
try { try {
const baseDirectory = process.env[`GITHUB_WORKSPACE`] || '' const workspaceDirectory = process.env[`GITHUB_WORKSPACE`] || ''
const buildRootDirectory = resolveBuildRootDirectory(workspaceDirectory)
const result = await execution.execute( const result = await execution.execute(
await resolveGradleExecutable(baseDirectory), await resolveGradleExecutable(
resolveBuildRootDirectory(baseDirectory), workspaceDirectory,
buildRootDirectory
),
buildRootDirectory,
parseCommandLineArguments() parseCommandLineArguments()
) )
@ -33,7 +37,10 @@ export async function run(): Promise<void> {
run() run()
async function resolveGradleExecutable(baseDirectory: string): Promise<string> { async function resolveGradleExecutable(
workspaceDirectory: string,
buildRootDirectory: string
): Promise<string> {
const gradleVersion = github.inputOrNull('gradle-version') const gradleVersion = github.inputOrNull('gradle-version')
if (gradleVersion !== null && gradleVersion !== 'wrapper') { if (gradleVersion !== null && gradleVersion !== 'wrapper') {
return path.resolve(await provision.gradleVersion(gradleVersion)) return path.resolve(await provision.gradleVersion(gradleVersion))
@ -46,14 +53,14 @@ async function resolveGradleExecutable(baseDirectory: string): Promise<string> {
path.resolve(gradleExecutable, '..') path.resolve(gradleExecutable, '..')
) )
} }
return path.resolve(baseDirectory, gradleExecutable) return path.resolve(workspaceDirectory, gradleExecutable)
} }
const wrapperDirectory = github.inputOrNull('wrapper-directory') const wrapperDirectory = github.inputOrNull('wrapper-directory')
const gradlewDirectory = const gradlewDirectory =
wrapperDirectory !== null wrapperDirectory !== null
? path.join(baseDirectory, wrapperDirectory) ? path.resolve(workspaceDirectory, wrapperDirectory)
: baseDirectory : buildRootDirectory
await cacheWrapper.restoreCachedWrapperDist(gradlewDirectory) await cacheWrapper.restoreCachedWrapperDist(gradlewDirectory)