Skip to content

Features/installer #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damccorm merged 9 commits into from
Jul 11, 2019
Merged

Features/installer #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8ec3a63
Initial attempt
Jul 10, 2019
71c35fe
Clean up
Jul 10, 2019
05dd7fb
Extract right directory
Jul 10, 2019
69118bc
Log whats happening
Jul 10, 2019
e07476f
Read correct directory
Jul 10, 2019
8481740
Full path
Jul 10, 2019
8a70afd
Allow java to be found in cache
Jul 10, 2019
83824f1
Add tests
Jul 10, 2019
35ebce6
Merge branch 'master' of https://github.com/actions/setup-java into f…
Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow java to be found in cache
  • Loading branch information
Danny McCormick
Danny McCormick committed Jul 10, 2019
commit 8a70afdf57e5b6c91250a4d64ff3a8db5eb681f2
8 changes: 4 additions & 4 deletions lib/installer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if (!tempDirectory) {
}
tempDirectory = path.join(baseLocation, 'actions', 'temp');
}
function getJava(versionSpec, arch, jdkFile) {
function getJava(version, arch, jdkFile) {
return __awaiter(this, void 0, void 0, function* () {
let toolPath = tc.find('Java', versionSpec);
let toolPath = tc.find('Java', version);
if (toolPath) {
core.debug(`Tool found in cache ${toolPath}`);
}
Expand All @@ -51,9 +51,9 @@ function getJava(versionSpec, arch, jdkFile) {
let tempDir = path.join(tempDirectory, 'temp_' + Math.floor(Math.random() * 2000000000));
const jdkDir = yield unzipJavaDownload(jdkFile, compressedFileExtension, tempDir);
core.debug(`jdk extracted to ${jdkDir}`);
toolPath = yield tc.cacheDir(jdkDir, 'Java', versionSpec, arch);
toolPath = yield tc.cacheDir(jdkDir, 'Java', `${version}.0.0`, arch);
}
let extendedJavaHome = 'JAVA_HOME_' + versionSpec + '_' + arch;
let extendedJavaHome = 'JAVA_HOME_' + version + '_' + arch;
core.exportVariable('JAVA_HOME', toolPath);
core.exportVariable(extendedJavaHome, toolPath);
core.addPath(path.join(toolPath, 'bin'));
Expand Down
8 changes: 4 additions & 4 deletions src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ if (!tempDirectory) {
}

export async function getJava(
versionSpec: string,
version: string,
arch: string,
jdkFile: string
): Promise<void> {
let toolPath = tc.find('Java', versionSpec);
let toolPath = tc.find('Java', version);

if (toolPath) {
core.debug(`Tool found in cache ${toolPath}`);
Expand All @@ -46,10 +46,10 @@ export async function getJava(
tempDir
);
core.debug(`jdk extracted to ${jdkDir}`);
toolPath = await tc.cacheDir(jdkDir, 'Java', versionSpec, arch);
toolPath = await tc.cacheDir(jdkDir, 'Java', `${version}.0.0`, arch);
}

let extendedJavaHome = 'JAVA_HOME_' + versionSpec + '_' + arch;
let extendedJavaHome = 'JAVA_HOME_' + version + '_' + arch;
core.exportVariable('JAVA_HOME', toolPath);
core.exportVariable(extendedJavaHome, toolPath);
core.addPath(path.join(toolPath, 'bin'));
Expand Down