test

boostsecurityio · Sep 17, 2024 · 529f76c · 529f76c
1 parent ac76473
commit 529f76c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/action.yaml b/action.yaml
@@ -43,7 +43,7 @@ inputs:
     description: "Optional relative path to scan"
     default: ""
   scan_timeout:
-    description: "Maximum amount of time a diff scan should complete in"
+    description: "Maximum amount of time a diff scan should complete in (deprecated)"
     default: ""
   scan_diff_timeout:
     description: "Maximum amount of time a diff scan should complete in"
@@ -65,7 +65,8 @@ runs:
         BOOST_GIT_MAIN_BRANCH: ${{ inputs.main_branch }}
         BOOST_IGNORE_FAILURE: ${{ inputs.ignore_failure }}
         BOOST_LOG_LEVEL: ${{ inputs.log_level }}
-        BOOST_DIFF_SCAN_TIMEOUT: ${{ (inputs.scan_diff_timeout == "") && inputs.scan_timeout || inputs.scan_diff_timeout }}
+        BOOST_SCAN_TIMEOUT: ${{ scan_timeout }}
+        BOOST_DIFF_SCAN_TIMEOUT: ${{ inputs.scan_diff_timeout }}
         BOOST_MAIN_SCAN_TIMEOUT: ${{ inputs.scan_main_timeout }}
         BOOST_PRE_SCAN: ${{ inputs.pre_scan_cmd }}
         BOOST_SCAN_LABEL: ${{ inputs.scan_label }}

diff --git a/lib/scan.sh b/lib/scan.sh
@@ -20,6 +20,8 @@ init.config ()
 {
   log.info "initializing configuration"
 
+  export BOOST_DIFF_SCAN_TIMEOUT=${BOOST_DIFF_SCAN_TIMEOUT:-${BOOST_SCAN_TIMEOUT:-}}
+
   export BOOST_TMP_DIR=${BOOST_TMP_DIR:-${WORKSPACE_TMP:-${TMPDIR:-/tmp}}}
   export BOOST_EXE=${BOOST_EXE:-${BOOST_TMP_DIR}/boost-cli/latest}