summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2019-11-01 17:00:50 +0000
committerCan Eldem <celdem@gitlab.com>2019-11-01 17:00:50 +0000
commit714226563abf51f395379f837c4efde0e187b63f (patch)
tree38f8b8a5cd4cd49fdc0baf5aa2f8bd95d42031a7
parent18357d73e9b804af4f0ad3e1e866c8c3a8d523b6 (diff)
parentde3ce469077cbc149b5da814c85621a9c6f00084 (diff)
Merge branch 'fix-npm-node-engine' into 'master'v1.8.2
Ignore engine and script when converting package.lock to yarn.lock See merge request gitlab-org/security-products/license-management!79
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/license/management/version.rb2
-rwxr-xr-xrun.sh3
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4354ab0..44faec0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v1.8.2
+
+- Ignore node version for installing npm dependencies(!79)
+
## v1.8.1
- Add mapping for `Apache License v2.0` to `Apache-2.0` (!78)
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index f42933e..4047dff 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '1.8.0'
+ VERSION = '1.8.2'
end
end
diff --git a/run.sh b/run.sh
index 81f28a2..ad17914 100755
--- a/run.sh
+++ b/run.sh
@@ -136,7 +136,8 @@ case "$COMMAND" in
trap restore_lockfile EXIT
echo "Convert package-lock.json to yarn.lock"
- yarn import
+ npm install
+ yarn import --ignore-engines --ignore-scripts
fi
# install via yarn