From aabde4f3b12027a87e284cc39700c6f1a633e3c1 Mon Sep 17 00:00:00 2001
From: Hugo Heuzard <hugo.heuzard@nomadic-labs.com>
Date: Mon, 19 Sep 2022 17:24:27 +0200
Subject: [PATCH 1/2] CI: make the ci fail if npm files are out of sync

---
 scripts/install_build_deps.js.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/install_build_deps.js.sh b/scripts/install_build_deps.js.sh
index 5c0f49091a65..cd7df0463f14 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
-- 
GitLab


From 656f0aab6d4c1a7b547533ce9cdbbff3e1428fd7 Mon Sep 17 00:00:00 2001
From: Hugo Heuzard <hugo.heuzard@nomadic-labs.com>
Date: Mon, 19 Sep 2022 17:27:36 +0200
Subject: [PATCH 2/2] CI: fix npm constraint

---
 manifest/manifest.ml | 3 +--
 package-lock.json    | 6 +++---
 package.json         | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index 0a5cbbde2046..e5650fccf7c1 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 3028caebe529..ec037f0a30eb 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 f1d31cf860b3..6311cadb83f6 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,
-- 
GitLab