From f7c5caf60596e1f0b8d4574c5905b2b930a41381 Mon Sep 17 00:00:00 2001 From: Bryan MacFarlane Date: Sun, 3 May 2020 16:37:13 -0400 Subject: [PATCH] dbg --- .github/workflows/versions.yml | 19 ++++++++++--------- src/installer.ts | 11 ----------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml index 71c85d0e..4ff033d9 100644 --- a/.github/workflows/versions.yml +++ b/.github/workflows/versions.yml @@ -29,18 +29,19 @@ jobs: with: node-version: 11 - name: Verify node and npm - run: __tests__/verify-node.sh 11 - # 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 + run: __tests__/verify-node.sh 11 + # test old versions which didn't have npm and layout different - name: Setup node 0.12.18 from dist uses: ./ with: node-version: 0.12.18 - name: Verify node 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 diff --git a/src/installer.ts b/src/installer.ts index 942d2441..16d85b6e 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -76,20 +76,9 @@ export async function getNode( let extPath: string; if (osPlat == 'win32') { 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); // 7z extracts to folder matching file name extPath = path.join(extPath, path.basename(info.fileName, '.7z')); - console.log( - `extPath: ${extPath}`, - `isDirectory: ${fs.statSync(extPath).isDirectory()}` - ); } else { extPath = await tc.extractTar(downloadPath, undefined, [ 'xz',