summaryrefslogtreecommitdiff
path: root/run.sh
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-05-05 13:26:35 +0000
committermo khan <mo.khan@gmail.com>2020-05-05 13:26:35 +0000
commit8e427c7987e90a028e6d9f344a9f70bb13b6eee4 (patch)
treefa912674be3b7898bb9e7622286baff980e8e908 /run.sh
parent6bd70e9995e70af4fd12e0c6fa55cf0340e22ba9 (diff)
parentc9915861e3db35719bf33aeed7eb4bbf82298267 (diff)
Merge branch 'npm-custom-registry' into 'master'v3.7.6
Exclude `devDependencies` from NodeJS based scan reports See merge request gitlab-org/security-products/license-management!141
Diffstat (limited to 'run.sh')
-rwxr-xr-xrun.sh9
1 files changed, 1 insertions, 8 deletions
diff --git a/run.sh b/run.sh
index 19dc495..9fd7746 100755
--- a/run.sh
+++ b/run.sh
@@ -17,6 +17,7 @@ export LANG=C.UTF-8
export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:=--no-debug}
export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'}
export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}"
+export NO_UPDATE_NOTIFIER=true
export PIPENV_VENV_IN_PROJECT=1
export PREPARE="${PREPARE:---prepare-no-fail}"
export RECURSIVE='--no-recursive'
@@ -56,13 +57,6 @@ function scan_project() {
license_management report $@
}
-function prepare_javascript() {
- if [ -f package.json ]; then
- [[ -f package-lock.json ]] && [[ ! -f yarn.lock ]] && npm ci
- [[ ! -d node_modules ]] && yarn install --ignore-engines --ignore-scripts
- fi
-}
-
function prepare_dotnet() {
[[ $(ls ./*.sln 2> /dev/null) ]] && RECURSIVE="--recursive"
}
@@ -77,7 +71,6 @@ function prepare_tools() {
function prepare_project() {
if [[ -z ${SETUP_CMD:-} ]]; then
prepare_tools || true
- prepare_javascript || true
prepare_dotnet || true
else
echo "Running '${SETUP_CMD}' to install project dependencies…"