Fix path

crazy-max · May 7, 2020 · 7fd7b98 · 7fd7b98
1 parent f9fe3d6
commit 7fd7b98
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/jest.config.js b/jest.config.js
@@ -1,6 +1,7 @@
 module.exports = {
   clearMocks: true,
   moduleFileExtensions: ['js', 'ts'],
+  setupFiles: ["dotenv/config"],
   testEnvironment: 'node',
   testMatch: ['**/*.test.ts'],
   testRunner: 'jest-circus/runner',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "@types/jest": "^25.2.1",
     "@types/node": "^13.13.5",
     "@zeit/ncc": "^0.22.1",
+    "dotenv": "^8.2.0",
     "jest": "^25.5.4",
     "jest-circus": "^25.5.4",
     "jest-runtime": "^25.5.4",

diff --git a/src/installer.ts b/src/installer.ts
@@ -1,4 +1,5 @@
 import * as fs from 'fs';
+import * as path from 'path';
 import * as os from 'os';
 import * as util from 'util';
 import * as github from './github';
@@ -26,10 +27,11 @@ export async function getXgo(version: string): Promise<string> {
   core.info('🔨 Fixing perms...');
   fs.chmodSync(downloadPath, '0755');
 
-  const cachePath: string = await tc.cacheFile(downloadPath, osPlat == 'win32' ? 'xgo.exe' : 'xgo', 'ghaction-xgo', semver);
+  const exeFile: string = osPlat == 'win32' ? 'xgo.exe' : 'xgo';
+  const cachePath: string = await tc.cacheFile(downloadPath, exeFile, 'ghaction-xgo', semver);
   core.debug(`Cached to ${cachePath}`);
 
-  return cachePath;
+  return path.join(cachePath, exeFile);
 }
 
 const getFilename = (): string => {