This commit is contained in:
Bryan MacFarlane 2020-05-03 16:37:13 -04:00
parent a4145577de
commit f7c5caf605
2 changed files with 10 additions and 20 deletions

View file

@ -30,13 +30,7 @@ jobs:
node-version: 11 node-version: 11
- name: Verify node and npm - name: Verify node and npm
run: __tests__/verify-node.sh 11 run: __tests__/verify-node.sh 11
# test version from node manifest # test old versions which didn't have npm and layout different
- name: Setup node 12 from manifest
uses: ./
with:
node-version: 12
- name: Verify node and npm
run: __tests__/verify-node.sh 12
- name: Setup node 0.12.18 from dist - name: Setup node 0.12.18 from dist
uses: ./ uses: ./
with: with:
@ -44,3 +38,10 @@ jobs:
- name: Verify node - name: Verify node
shell: bash shell: bash
run: __tests__/verify-node.sh 0.12.18 SKIP_NPM run: __tests__/verify-node.sh 0.12.18 SKIP_NPM
# test version from node manifest
- name: Setup node 12 from manifest
uses: ./
with:
node-version: 12
- name: Verify node and npm
run: __tests__/verify-node.sh 12

View file

@ -76,20 +76,9 @@ export async function getNode(
let extPath: string; let extPath: string;
if (osPlat == 'win32') { if (osPlat == 'win32') {
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe'); let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
console.log(
`downloadPath: ${downloadPath}`,
`isFile: ${fs.statSync(downloadPath).isFile()}`
);
console.log(JSON.stringify(fs.statSync(downloadPath)));
extPath = await tc.extract7z(downloadPath, undefined, _7zPath); extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to folder matching file name // 7z extracts to folder matching file name
extPath = path.join(extPath, path.basename(info.fileName, '.7z')); extPath = path.join(extPath, path.basename(info.fileName, '.7z'));
console.log(
`extPath: ${extPath}`,
`isDirectory: ${fs.statSync(extPath).isDirectory()}`
);
} else { } else {
extPath = await tc.extractTar(downloadPath, undefined, [ extPath = await tc.extractTar(downloadPath, undefined, [
'xz', 'xz',