From c0c767a4487d66e506eab4110011d615a00a4974 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Mon, 16 Jan 2023 20:34:02 +0900 Subject: [PATCH] Switch to composite action --- action.yml | 12 ++++++++++-- main.js | 28 ---------------------------- 2 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 main.js diff --git a/action.yml b/action.yml index bee4b90dc..c0fb6d8e6 100644 --- a/action.yml +++ b/action.yml @@ -11,6 +11,14 @@ inputs: required: false default: 'true' +# Note: +# - inputs.* should be manually mapped to INPUT_* due to https://github.com/actions/runner/issues/665 +# - Use GITHUB_*/RUNNER_* instead of github.*/runner.* due to https://github.com/actions/runner/issues/2185 runs: - using: node16 - main: main.js + using: composite + steps: + - run: bash --noprofile --norc "${GITHUB_ACTION_PATH:?}/main.sh" + shell: bash + env: + INPUT_TOOL: ${{ inputs.tool }} + INPUT_CHECKSUM: ${{ inputs.checksum }} diff --git a/main.js b/main.js deleted file mode 100644 index 804c20d23..000000000 --- a/main.js +++ /dev/null @@ -1,28 +0,0 @@ -// This is a script that just calls the bash script that does the main -// processing of the action. It works like a composite action that calls -// a single bash script. -// -// This was originally a trick adopted to make bash script-based actions work -// without docker before composite actions were supported. However, due to -// various problems with composite actions, this trick is still needed: -// - https://github.com/actions/runner/issues/665 -// - https://github.com/actions/runner/issues/2185 -// Although there are ways to work around these like cache-cargo-install-action does: -// https://github.com/taiki-e/cache-cargo-install-action/blob/v1.0.1/action.yml#L9-L11 - -const { execFileSync } = require('child_process'); - -function main() { - try { - execFileSync( - 'bash', - ['--noprofile', '--norc', `${__dirname}/main.sh`], - { stdio: 'inherit' } - ); - } catch (e) { - console.log(`::error::${e.message}`); - process.exit(1); - } -} - -main();