actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java synced 2024-12-22 21:22:41 +00:00
Code Issues Activity

Merge pull request #78 from aibaars/patch-1

Browse source 
Normalize extendedJavaHome environment variable
This commit is contained in:
Konrad Pabjan 2020-06-22 11:04:01 +02:00 committed by GitHub
commit d920b7da5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dist/index.js generated vendored
View file

@ -4742,6 +4742,12 @@ function getJava(version, arch, jdkFile, javaPackage) {
toolPath = yield tc.cacheDir(jdkDir, javaPackage, getCacheVersionString(version), arch); toolPath = yield tc.cacheDir(jdkDir, javaPackage, getCacheVersionString(version), arch);
} }
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'));

6
src/installer.ts
View file

@ -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'));