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
Extract right directory
  • Loading branch information
Danny McCormick
Danny McCormick committed Jul 10, 2019
commit 05dd7fbe7551937fbb5b37edfa0b0927e8be2455
4 changes: 2 additions & 2 deletions lib/installer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ function getJava(versionSpec, arch, jdkFile) {
core.debug('Retrieving Jdk from local path');
const compressedFileExtension = getFileEnding(jdkFile);
let tempDir = path.join(tempDirectory, 'temp_' + Math.floor(Math.random() * 2000000000));
yield unzipJavaDownload(jdkFile, compressedFileExtension, tempDir);
toolPath = yield tc.cacheDir(tempDir, 'Java', versionSpec, arch);
const jdkDir = yield unzipJavaDownload(jdkFile, compressedFileExtension, tempDir);
toolPath = yield tc.cacheDir(jdkDir, 'Java', versionSpec, arch);
}
let extendedJavaHome = 'JAVA_HOME_' + versionSpec + '_' + arch;
core.exportVariable('JAVA_HOME', toolPath);
Expand Down
8 changes: 6 additions & 2 deletions src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@ export async function getJava(
tempDirectory,
'temp_' + Math.floor(Math.random() * 2000000000)
);
await unzipJavaDownload(jdkFile, compressedFileExtension, tempDir);
toolPath = await tc.cacheDir(tempDir, 'Java', versionSpec, arch);
const jdkDir = await unzipJavaDownload(
jdkFile,
compressedFileExtension,
tempDir
);
toolPath = await tc.cacheDir(jdkDir, 'Java', versionSpec, arch);
}

let extendedJavaHome = 'JAVA_HOME_' + versionSpec + '_' + arch;
Expand Down