platform testing

Author: jeffreyaven

dist/index.js

@@ -6724,11 +6724,10 @@ async function downloadCLI(osPlatform){
       case 'win32':
         return await tc.extractZip(await tc.downloadTool(url));
       case 'darwin':
-        // let tmpPath = await tc.extractXar(await tc.downloadTool(url));
-        let tmpPath = await tc.downloadTool(url);
+        let tmpPath = await tc.extractXar(await tc.downloadTool(url));
         core.info(`extracting mac pkg in ${tmpPath}...`);
         const installPath = '/Users/runner/work/_temp/stackql';
-        execSync(`pkgutil --expand ${tmpPath} ${installPath}`);
+        execSync(`pkgutil --expand-full ${tmpPath} ${installPath}`);
         return installPath;
       case 'linux':
         return await tc.extractZip(await tc.downloadTool(url));
@@ -6799,65 +6798,6 @@ async function setup() {
       core.setFailed(error.message);
     }
   })();
-
-
-// const io = require('@actions/io');
-// const core = require('@actions/core');
-// const tc = require('@actions/tool-cache');
-
-// const urls = {
-//   'linux': 'https://releases.stackql.io/stackql/latest/stackql_linux_amd64.zip',
-//   'darwin': 'https://storage.googleapis.com/stackql-public-releases/latest/stackql_darwin_multiarch.pkg',
-//   'win32': 'https://releases.stackql.io/stackql/latest/stackql_windows_amd64.zip',
-// }
-
-
-// async function installWrapper(cliPath) {
-//   let source, target;
-
-//   // If we're on Windows, then the executable ends with .exe
-//   const exeSuffix = os.platform().startsWith('win') ? '.exe' : '';
-
-//   // Rename stackql(.exe) to stackql-bin(.exe)
-//   try {
-//     source = [cliPath, `stackql${exeSuffix}`].join(path.sep);
-//     target = [cliPath, `stackql-bin${exeSuffix}`].join(path.sep);
-//     core.debug(`Moving ${source} to ${target}.`);
-//     await io.mv(source, target);
-//   } catch (e) {
-//     core.debug(`Unable to move ${source} to ${target}.`);
-//     throw e;
-//   }
-
-//   // Install our wrapper as stackql by moving the wrapped executable to stackql
-//   try {
-//     source = path.resolve([__dirname, '..', 'wrapper', 'dist', 'index.js'].join(path.sep));
-//     target = [cliPath, 'stackql'].join(path.sep);
-//     core.debug(`Copying ${source} to ${target}.`);
-//     await io.cp(source, target);
-//   } catch (e) {
-//     core.error(`Unable to copy ${source} to ${target}.`);
-//     throw e;
-//   }
-
-//   // Export a new environment variable, so our wrapper can locate the binary
-//   core.exportVariable('STACKQL_CLI_PATH', cliPath);
-// }
-
-
-// async function setup(){
-
-  
-//   const wrapper = core.getInput('use_wrapper') === 'true';
-//   if(wrapper){
-//     core.debug('installing wrapper')
-//     await installWrapper(cliPath)
-//   }
-//   
-
-// }
-
-
 })();
 
 module.exports = __webpack_exports__;

index.js

@@ -22,11 +22,10 @@ async function downloadCLI(osPlatform){
       case 'win32':
         return await tc.extractZip(await tc.downloadTool(url));
       case 'darwin':
-        // let tmpPath = await tc.extractXar(await tc.downloadTool(url));
-        let tmpPath = await tc.downloadTool(url);
+        let tmpPath = await tc.extractXar(await tc.downloadTool(url));
         core.info(`extracting mac pkg in ${tmpPath}...`);
         const installPath = '/Users/runner/work/_temp/stackql';
-        execSync(`pkgutil --expand ${tmpPath} ${installPath}`);
+        execSync(`pkgutil --expand-full ${tmpPath} ${installPath}`);
         return installPath;
       case 'linux':
         return await tc.extractZip(await tc.downloadTool(url));
@@ -96,62 +95,4 @@ async function setup() {
     } catch (error) {
       core.setFailed(error.message);
     }
-  })();
-
-
-// const io = require('@actions/io');
-// const core = require('@actions/core');
-// const tc = require('@actions/tool-cache');
-
-// const urls = {
-//   'linux': 'https://releases.stackql.io/stackql/latest/stackql_linux_amd64.zip',
-//   'darwin': 'https://storage.googleapis.com/stackql-public-releases/latest/stackql_darwin_multiarch.pkg',
-//   'win32': 'https://releases.stackql.io/stackql/latest/stackql_windows_amd64.zip',
-// }
-
-
-// async function installWrapper(cliPath) {
-//   let source, target;
-
-//   // If we're on Windows, then the executable ends with .exe
-//   const exeSuffix = os.platform().startsWith('win') ? '.exe' : '';
-
-//   // Rename stackql(.exe) to stackql-bin(.exe)
-//   try {
-//     source = [cliPath, `stackql${exeSuffix}`].join(path.sep);
-//     target = [cliPath, `stackql-bin${exeSuffix}`].join(path.sep);
-//     core.debug(`Moving ${source} to ${target}.`);
-//     await io.mv(source, target);
-//   } catch (e) {
-//     core.debug(`Unable to move ${source} to ${target}.`);
-//     throw e;
-//   }
-
-//   // Install our wrapper as stackql by moving the wrapped executable to stackql
-//   try {
-//     source = path.resolve([__dirname, '..', 'wrapper', 'dist', 'index.js'].join(path.sep));
-//     target = [cliPath, 'stackql'].join(path.sep);
-//     core.debug(`Copying ${source} to ${target}.`);
-//     await io.cp(source, target);
-//   } catch (e) {
-//     core.error(`Unable to copy ${source} to ${target}.`);
-//     throw e;
-//   }
-
-//   // Export a new environment variable, so our wrapper can locate the binary
-//   core.exportVariable('STACKQL_CLI_PATH', cliPath);
-// }
-
-
-// async function setup(){
-
-  
-//   const wrapper = core.getInput('use_wrapper') === 'true';
-//   if(wrapper){
-//     core.debug('installing wrapper')
-//     await installWrapper(cliPath)
-//   }
-//   
-
-// }
-
+  })();