summaryrefslogtreecommitdiff
path: root/run.sh
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2019-10-22 20:24:29 +0000
committermo khan <mo.khan@gmail.com>2019-10-22 20:24:29 +0000
commit431f07f8d11b2bc2a8fd09351a4323c9df676822 (patch)
tree4f40b60925a4edf8eace71ae8af65bb5d67c7b6b /run.sh
parent7f175952a5a047d785b5ea72c15a10642523c62a (diff)
parent561556fbd1f59492cfa8fdd790f2ce39c90f3a8d (diff)
Merge branch 'remove-tech-debt' into 'master'v1.7.2
Remove feature flags and temporary mappings See merge request gitlab-org/security-products/license-management!75
Diffstat (limited to 'run.sh')
-rwxr-xr-xrun.sh14
1 files changed, 2 insertions, 12 deletions
diff --git a/run.sh b/run.sh
index 6997490..388fb92 100755
--- a/run.sh
+++ b/run.sh
@@ -193,21 +193,11 @@ case "$COMMAND" in
if [ "$skip_prepare" != true ]; then
prepare="--prepare"
fi
- if [ "$FEATURE_RUBY_REPORT" = 'true' ]; then
- echo "Preparing JSON report..."
- license_management report ${prepare} --format=json --save=gl-license-management-report.json
- else
- echo "Preparing HTML report..."
- license_finder report ${prepare} --format=html --save=gl-license-management-report.html
- fi
+ echo "Preparing JSON report..."
+ license_management report ${prepare} --format=json --save=gl-license-management-report.json
# rvm removes trap in bash: https://github.com/rvm/rvm/issues/4416
declare -f restore_lockfile > /dev/null && restore_lockfile
popd > /dev/null
-
- if [ -f "gl-license-management-report.html" ]; then
- # Extract data from the HTML report and put it into a JSON file
- node /html2json.js $APP_PATH/gl-license-management-report.html > $APP_PATH/gl-license-management-report.json
- fi
;;
*)