gh-actions/github/run: Improve args (take 2) (#934)

Signed-off-by: Ryan Northey <ryan@synca.io>
envoyproxy · Nov 4, 2023 · bddd762 · bddd762
1 parent 9e8cdcd
commit bddd762
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/gh-actions/github/run/action.yml b/gh-actions/github/run/action.yml
@@ -5,9 +5,6 @@ inputs:
     required: true
   args:
     type: string
-  command-prefix:
-    type: string
-    default:
   container-command:
     type: string
     default:
@@ -47,16 +44,15 @@ runs:
           rm -rf "$SOURCETMP"
       fi
       COMMAND=()
-      if [[ -n "${{ inputs.container-command }}" ]]; then
+      read -ra ARGS <<< "${{ inputs.args }}"
+      ACTUAL_COMMAND=(
+          ${{ inputs.command }}
+          ${ARGS[@]})
+      CONTAINER_COMMAND="${{ inputs.container-command }}"
+      if [[ "${#CONTAINER_COMMAND}" -ne 0 ]]; then
           COMMAND+=(${{ inputs.container-command }})
       fi
-      if [[ -n "${{ inputs.container-command }}" && -n "${{ inputs.command-prefix }}" ]]; then
-          COMMAND+=('${{ inputs.command-prefix }} ${{ inputs.command }}')
-      else
-          COMMAND+=(
-              ${{ inputs.command-prefix }}
-              ${{ inputs.command }})
-      fi
+      COMMAND+=("${ACTUAL_COMMAND[@]}")
       TMP_OUTPUT=$(mktemp)
       if [[ -n "$RUNNER_DEBUG" || -n "$CI_DEBUG" ]]; then
           echo "DEBUG: RUN ${COMMAND[*]}" >&2