From 78e1c9506039dcfa324e28d95b07f49dd881ad6b Mon Sep 17 00:00:00 2001 From: Sn0wCrack <442287+Sn0wCrack@users.noreply.github.com> Date: Mon, 7 Apr 2025 16:25:42 +1000 Subject: [PATCH] feat: set this via an environment variable instead --- action.yml | 4 ---- src/install.ts | 1 - src/scripts/unix.sh | 2 ++ 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/action.yml b/action.yml index d52dda08..357b9c13 100644 --- a/action.yml +++ b/action.yml @@ -27,10 +27,6 @@ inputs: tools: description: 'Setup popular tools globally.' required: false - tools-dir: - description: 'Directory where all tools will be installed to.' - defaut: '/usr/local/bin' - required: false outputs: php-version: description: 'PHP version in semver format' diff --git a/src/install.ts b/src/install.ts index b38c61fc..003a4d5e 100644 --- a/src/install.ts +++ b/src/install.ts @@ -19,7 +19,6 @@ export async function getScript(os: string): Promise { const script_path = path.join(__dirname, '../src/scripts', filename); const run_path = script_path.replace(os, 'run'); process.env['fail_fast'] = await utils.getInput('fail-fast', false); - process.env['tool_path_dir'] = await utils.getInput('tools-dir', false); const extension_csv: string = await utils.getInput('extensions', false); const ini_values_csv: string = await utils.getInput('ini-values', false); const coverage_driver: string = await utils.getInput('coverage', false); diff --git a/src/scripts/unix.sh b/src/scripts/unix.sh index f62f3cd3..2432626f 100644 --- a/src/scripts/unix.sh +++ b/src/scripts/unix.sh @@ -55,6 +55,7 @@ read_env() { fail_fast="${fail_fast:-${FAIL_FAST:-false}}" [[ -z "${ImageOS}" && -z "${ImageVersion}" || -n ${ACT} ]] && _runner=self-hosted || _runner=github runner="${runner:-${RUNNER:-$_runner}}" + tool_path_dir="${tools_dir:-${TOOLS_DIR:-/usr/local/bin}}" if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then fail_fast=true @@ -75,6 +76,7 @@ read_env() { export runner export update export ts + export tools_dir_path } # Function to create a lock.