Merge branch 'upgrade-license-finder' into 'master'v3.23.0

Upgrade license finder to 6.8.1

See merge request gitlab-org/security-products/license-management!209

1 files changed, 1 insertions, 20 deletions

diff --git a/run.sh b/run.sh
index 5a97690..b4d6bdd 100755
--- a/run.sh
+++ b/run.sh
@@ -9,7 +9,7 @@ set -e
 export ASDF_JAVA_VERSION="${ASDF_JAVA_VERSION:-}"
 export ASDF_PYTHON_VERSION="${ASDF_PYTHON_VERSION:-}"
 export CI_API_V4_URL="${CI_API_V4_URL:-https://gitlab.com/api/v4}"
-export CI_DEBUG_TRACE=${CI_DEBUG_TRACE:='false'}
+export DEBIAN_FRONTEND=noninteractive
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export GO111MODULE=on
 export GOPATH=/opt/gitlab/.local
@@ -31,26 +31,9 @@ export RUBY_HEAP_FREE_MIN=100000
 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 export RUBY_HEAP_SLOTS_INCREMENT=400000
 
-[[ $CI_DEBUG_TRACE == 'true' ]] && echo "$@"
-
 project_dir="${CI_PROJECT_DIR:-${@: -1}}"
 [[ -d $project_dir ]] && cd "$project_dir"
 
-function debug_env() {
-  pwd
-  ls -alh
-  env | sort
-  asdf current
-
-  ruby -v
-  gem --version
-  bundle --version
-  bundle config
-
-  python --version
-  pip --version
-}
-
 function scan_project() {
   echo license_management report "$@"
   # shellcheck disable=SC2068
@@ -108,8 +91,6 @@ echo -e "section_start:$(date +%s):prepare_project\r\e[0KPrepare"
 prepare_project
 echo -e "section_end:$(date +%s):prepare_project\r\e[0K"
 
-[[ $CI_DEBUG_TRACE == 'true' ]] && debug_env
-
 scan_project "$PREPARE" \
   --format=json \
   --save="${LM_REPORT_FILE}" \