mirror of
https://github.com/actions/setup-java.git
synced 2024-11-23 10:09:03 +00:00
Merge pull request #78 from aibaars/patch-1
Normalize extendedJavaHome environment variable
This commit is contained in:
commit
d920b7da5f
BIN
dist/index.js
generated
vendored
BIN
dist/index.js
generated
vendored
Binary file not shown.
@ -87,6 +87,12 @@ export async function getJava(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let extendedJavaHome = 'JAVA_HOME_' + version + '_' + arch;
|
let extendedJavaHome = 'JAVA_HOME_' + version + '_' + arch;
|
||||||
|
core.exportVariable(extendedJavaHome, toolPath); //TODO: remove for v2
|
||||||
|
// For portability reasons environment variables should only consist of
|
||||||
|
// uppercase letters, digits, and the underscore. Therefore we convert
|
||||||
|
// the extendedJavaHome variable to upper case and replace '.' symbols and
|
||||||
|
// any other non-alphanumeric characters with an underscore.
|
||||||
|
extendedJavaHome = extendedJavaHome.toUpperCase().replace(/[^0-9A-Z_]/g, '_');
|
||||||
core.exportVariable('JAVA_HOME', toolPath);
|
core.exportVariable('JAVA_HOME', toolPath);
|
||||||
core.exportVariable(extendedJavaHome, toolPath);
|
core.exportVariable(extendedJavaHome, toolPath);
|
||||||
core.addPath(path.join(toolPath, 'bin'));
|
core.addPath(path.join(toolPath, 'bin'));
|
||||||
|
Loading…
Reference in New Issue
Block a user