Skip to content

Commit 37b1eb8

Browse files
committed
Fix
1 parent c3d26b9 commit 37b1eb8

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

image/actions.sh

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -310,19 +310,14 @@ function init-backend-default-workspace() {
310310
function select-workspace() {
311311
local WORKSPACE_EXIT
312312

313-
if [[ "$VARIABLE_ARGS" == "" ]]; then
314-
debug_log "$TOOL_COMMAND_NAME" workspace select "$INPUT_WORKSPACE"
315-
set +e
316-
(cd "$INPUT_PATH" && "$TOOL_COMMAND_NAME" workspace select "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1
317-
WORKSPACE_EXIT=$?
318-
set -e
319-
else
320-
debug_log "$TOOL_COMMAND_NAME" workspace select "$VARIABLE_ARGS" "$INPUT_WORKSPACE"
321-
set +e
322-
(cd "$INPUT_PATH" && "$TOOL_COMMAND_NAME" workspace select "$VARIABLE_ARGS" "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1
323-
WORKSPACE_EXIT=$?
324-
set -e
325-
fi
313+
# shellcheck disable=SC2086
314+
debug_log "$TOOL_COMMAND_NAME" workspace select $VARIABLE_ARGS "$INPUT_WORKSPACE"
315+
316+
set +e
317+
# shellcheck disable=SC2086
318+
(cd "$INPUT_PATH" && "$TOOL_COMMAND_NAME" workspace select $VARIABLE_ARGS "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1
319+
WORKSPACE_EXIT=$?
320+
set -e
326321

327322
if [[ -s "$STEP_TMP_DIR/workspace_select" ]]; then
328323
start_group "Selecting workspace"

image/entrypoints/test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ function set-test-args() {
3434

3535
function test() {
3636

37-
debug_log $TOOL_COMMAND_NAME test -no-color $TEST_ARGS '$VARIABLE_ARGS' # don't expand VARIABLE_ARGS
37+
# shellcheck disable=SC2086
38+
debug_log $TOOL_COMMAND_NAME test -no-color $TEST_ARGS $VARIABLE_ARGS
3839

3940
set +e
4041
# shellcheck disable=SC2086

0 commit comments

Comments
 (0)