Merge branch 'main' into feature/default-to-runner-architecture

This commit is contained in:
Wes Morgan 2022-09-19 08:58:18 -06:00
commit 36a2b1194e
No known key found for this signature in database
GPG key ID: 5639E4CBFA17DC84
21 changed files with 4284 additions and 3630 deletions

View file

@ -143,11 +143,13 @@ export abstract class JavaBase {
}
protected setJavaDefault(version: string, toolPath: string) {
const majorVersion = version.split('.')[0];
core.exportVariable('JAVA_HOME', toolPath);
core.addPath(path.join(toolPath, 'bin'));
core.setOutput('distribution', this.distribution);
core.setOutput('path', toolPath);
core.setOutput('version', version);
core.exportVariable(`JAVA_HOME_${majorVersion}_${this.architecture.toUpperCase()}`, toolPath);
}
protected distributionArchitecture(): string {