diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 0a5cbbde2046724918f47259bfca2dcb4c509def..e5650fccf7c174235e1e115d56f4a0912529233e 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2435,8 +2435,7 @@ let generate_package_json_file () = write "package.json" @@ fun fmt -> Format.fprintf fmt - {| -{ + {|{ "DO NOT EDIT": "This file was automatically generated, edit file manifest/main.ml instead", "private": true, "type": "commonjs", diff --git a/package-lock.json b/package-lock.json index 3028caebe529bcb5bc2823734cf67c205c913ac7..ec037f0a30eb2b15ef40d459c4873fae73f1c93a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,9 +3,9 @@ "lockfileVersion": 1, "dependencies": { "@dannywillems/ocaml-bls12-381": { - "version": "3.0.1", - "resolved": "https://gitlab.com/api/v4/projects/16568061/packages/npm/@dannywillems/ocaml-bls12-381/-/@dannywillems/ocaml-bls12-381-3.0.1.tgz", - "integrity": "sha1-p9V04XVhBlFU3Guad1a9XXh38Fc=" + "version": "4.0.0", + "resolved": "https://gitlab.com/api/v4/projects/16568061/packages/npm/@dannywillems/ocaml-bls12-381/-/@dannywillems/ocaml-bls12-381-4.0.0.tgz", + "integrity": "sha1-M2TlDp0LJ6czBxLqJY/+IZ5tORI=" }, "@nomadic-labs/secp256k1-wasm": { "version": "0.3.0", diff --git a/package.json b/package.json index f1d31cf860b3273c9aa66e034b947df6d0fcc27b..6311cadb83f61f7ffd8ff8a576366e1d06f6c228 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,3 @@ - { "DO NOT EDIT": "This file was automatically generated, edit file manifest/main.ml instead", "private": true, diff --git a/scripts/install_build_deps.js.sh b/scripts/install_build_deps.js.sh index 5c0f49091a655c099cfe98f7d74df29d80cf0bee..cd7df0463f14b24a642bd8056e88f6f17313b7fa 100755 --- a/scripts/install_build_deps.js.sh +++ b/scripts/install_build_deps.js.sh @@ -64,5 +64,10 @@ nvm use --delete-prefix "$NODE_VERSION" echo "Check versions" node --version -npm install - +# [npm ci] is like [npm install] but will fail if [package.json] and +# [package-lock.json] disagree. It also removes any pre-existing [node_modules] install. +if [ -z "${CI_PROJECT_DIR}" ] ; then + npm install ; +else + npm ci ; +fi