From 5165ab8c4d6e049475fecb665ed159ad64ad480b Mon Sep 17 00:00:00 2001 From: Jeffrey Aven Date: Mon, 29 Apr 2024 08:09:49 +1000 Subject: [PATCH 1/3] darwin updates --- dist/index.js | 12 ++++++------ index.js | 12 ++++++------ package.json | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dist/index.js b/dist/index.js index 700642e..a900158 100644 --- a/dist/index.js +++ b/dist/index.js @@ -6861,7 +6861,7 @@ async function setup() { core.debug(`path to cli: ${cliPath}`); // set perms and make executable - if(osPlatform != 'darwin'){ + if(osPlatform !== 'darwin'){ core.debug(`updating permissions for ${cliPath}...`); fs.chmodSync(cliPath, '777'); core.debug(`adding ${cliPath} to the path...`); @@ -6869,11 +6869,11 @@ async function setup() { await makeExecutable(cliPath, osPlatform) } - const wrapper = core.getInput('use_wrapper') === 'true'; - - if(wrapper){ - core.info('installing wrapper...') - await installWrapper(cliPath) + // Check if wrapper is needed and if it's not Darwin + const useWrapper = core.getInput('use_wrapper') === 'true'; + if(useWrapper && osPlatform !== 'darwin'){ + core.info('installing wrapper...'); + await installWrapper(cliPath); } core.info(`successfully setup stackql at ${cliPath}`); diff --git a/index.js b/index.js index 09dd51d..b41513e 100644 --- a/index.js +++ b/index.js @@ -112,7 +112,7 @@ async function setup() { core.debug(`path to cli: ${cliPath}`); // set perms and make executable - if(osPlatform != 'darwin'){ + if(osPlatform !== 'darwin'){ core.debug(`updating permissions for ${cliPath}...`); fs.chmodSync(cliPath, '777'); core.debug(`adding ${cliPath} to the path...`); @@ -120,11 +120,11 @@ async function setup() { await makeExecutable(cliPath, osPlatform) } - const wrapper = core.getInput('use_wrapper') === 'true'; - - if(wrapper){ - core.info('installing wrapper...') - await installWrapper(cliPath) + // Check if wrapper is needed and if it's not Darwin + const useWrapper = core.getInput('use_wrapper') === 'true'; + if(useWrapper && osPlatform !== 'darwin'){ + core.info('installing wrapper...'); + await installWrapper(cliPath); } core.info(`successfully setup stackql at ${cliPath}`); diff --git a/package.json b/package.json index 0b22afd..dbfb240 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "setup-stackql", - "version": "2.2.0", + "version": "2.2.1", "description": "", "main": "index.js", "scripts": { From ce6583a840188c8f38535c4c23cc751db6a944b4 Mon Sep 17 00:00:00 2001 From: Jeffrey Aven Date: Mon, 29 Apr 2024 08:14:07 +1000 Subject: [PATCH 2/3] darwin updates --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07b1932..4d58f7d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Setup StackQL](https://github.com/stackql/setup-stackql/actions/workflows/setup-stackql.yml/badge.svg)](https://github.com/stackql/setup-stackql/actions/workflows/setup-stackql.yml) +[![Setup StackQL](https://github.com/stackql/setup-stackql/actions/workflows/setup-stackql-test.yml/badge.svg)](https://github.com/stackql/setup-stackql/actions/workflows/setup-stackql-test.yml) # setup-stackql From 792df74cd1e8e2a2012a36db77f24dbb63f88f4a Mon Sep 17 00:00:00 2001 From: Jeffrey Aven Date: Mon, 29 Apr 2024 08:16:57 +1000 Subject: [PATCH 3/3] darwin updates --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4d58f7d..1b02224 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Authentication to StackQL providers is done via environment variables source fro The following example demonstrate the use of the `stackql/setup-stackql` action in a GitHub Actions workflow, demonstrating how to use the action to install the `stackql` CLI and then use it to execute a StackQL query. ### GitHub Example -Check the "Use GitHub Provider" step in [setup-stackql.yml](.github/workflows/setup-stackql.yml) for the working example, for more information on the GitHub provider for StackQL, see the [GitHub Provider Docs](https://registry.stackql.io/github). +Check the "Use GitHub Provider" step in [setup-stackql-test.yml](.github/workflows/setup-stackql-test.yml) for the working example, for more information on the GitHub provider for StackQL, see the [GitHub Provider Docs](https://registry.stackql.io/github). ```yaml - name: setup StackQL @@ -30,7 +30,7 @@ Check the "Use GitHub Provider" step in [setup-stackql.yml](.github/workflows/se ``` ### Google Example -Check the "Use Google Provider" step in [setup-stackql.yml](.github/workflows/setup-stackql.yml) for the working example, for more information on the Google provider for StackQL, see the [Google Provider Docs](https://registry.stackql.io/google). +Check the "Use Google Provider" step in [setup-stackql-test.yml](.github/workflows/setup-stackql-test.yml) for the working example, for more information on the Google provider for StackQL, see the [Google Provider Docs](https://registry.stackql.io/google). ```yaml - name: setup StackQL @@ -46,7 +46,7 @@ Check the "Use Google Provider" step in [setup-stackql.yml](.github/workflows/se ``` ## Inputs -- `use_wrapper` - (optional) Whether to install a wrapper to wrap subsequent calls of +- __`use_wrapper`__ - (optional) Whether to install a wrapper to wrap subsequent calls of the `stackql` binary and expose its STDOUT, STDERR, and exit code as outputs named `stdout`, `stderr`, and `exitcode` respectively. Defaults to `false`. @@ -54,6 +54,6 @@ Check the "Use Google Provider" step in [setup-stackql.yml](.github/workflows/se This action does not configure any outputs directly. However, when you set the `use_wrapper` input to `true`, the following outputs are available for subsequent steps that call the `stackql` binary: -- `stdout` - The STDOUT stream of the call to the `stackql` binary. -- `stderr` - The STDERR stream of the call to the `stackql` binary. -- `exitcode` - The exit code of the call to the `stackql` binary. +- __`stdout`__ - The STDOUT stream of the call to the `stackql` binary. +- __`stderr`__ - The STDERR stream of the call to the `stackql` binary. +- __`exitcode`__ - The exit code of the call to the `stackql` binary.