mirror of
https://github.com/gradle/gradle-build-action.git
synced 2024-11-27 02:30:56 -05:00
Merge branch 'master' into releases/v1
This commit is contained in:
commit
a2ba194e38
2 changed files with 2 additions and 1 deletions
|
@ -92,6 +92,7 @@ Moreover, you can use the following aliases:
|
||||||
|
|
||||||
| Alias | Selects |
|
| Alias | Selects |
|
||||||
| --- |---|
|
| --- |---|
|
||||||
|
| `wrapper` | The Gradle wrapper's version (default, useful for matrix builds) |
|
||||||
| `current` | The current [stable release](https://gradle.org/install/) |
|
| `current` | The current [stable release](https://gradle.org/install/) |
|
||||||
| `rc` | The current [release candidate](https://gradle.org/release-candidate/) if any, otherwise fallback to `current` |
|
| `rc` | The current [release candidate](https://gradle.org/release-candidate/) if any, otherwise fallback to `current` |
|
||||||
| `nightly` | The latest [nightly](https://gradle.org/nightly/), fails if none. |
|
| `nightly` | The latest [nightly](https://gradle.org/nightly/), fails if none. |
|
||||||
|
|
|
@ -39,7 +39,7 @@ run();
|
||||||
async function resolveGradleExecutable(baseDirectory: string): Promise<string> {
|
async function resolveGradleExecutable(baseDirectory: string): Promise<string> {
|
||||||
|
|
||||||
const gradleVersion = inputOrNull("gradle-version");
|
const gradleVersion = inputOrNull("gradle-version");
|
||||||
if (gradleVersion != null) {
|
if (gradleVersion != null && gradleVersion != "wrapper") {
|
||||||
return path.resolve(await provision.gradleVersion(gradleVersion))
|
return path.resolve(await provision.gradleVersion(gradleVersion))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue