tianzixuan/gradle-build-action
1
0
Fork 0
mirror of https://github.com/gradle/gradle-build-action.git synced 2024-12-26 02:36:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into releases/v1

Browse Source
This commit is contained in:
Paul Merlin 2019-12-09 15:20:11 +01:00
commit a2ba194e38
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -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. |

2
src/main.ts
View File

@ -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))
} }