Merge pull request #1251 from lamassu/build/remove-extra-archs

LAM-1250 fix: copy-node-modules fails at nested deps
lamassu · Nov 29, 2024 · 08ee6ec · 08ee6ec
2 parents 5a685f7 + a81cd3c
commit 08ee6ec
Show file tree

Hide file tree

Showing 4 changed files with 960 additions and 129 deletions.
diff --git a/build-scripts/Dockerfile.ci b/build-scripts/Dockerfile.ci
@@ -19,7 +19,7 @@ FROM lamassu/upboard-build:3.0 as build
 
   RUN npm install --global json
   RUN json -I -f package.json -e 'this.dependencies["@lamassu/bnr-advance"] = this.optionalDependencies["@lamassu/bnr-advance"]; delete this.optionalDependencies["@lamassu/bnr-advance"]'
-  RUN json -I -f package.json -e 'this.dependencies["genmega"] = this.optionalDependencies["genmega"]; delete this.optionalDependencies["genmega"]'
+  RUN json -I -f package.json -e 'this.dependencies["@lamassu/genmega"] = this.optionalDependencies["@lamassu/genmega"]; delete this.optionalDependencies["@lamassu/genmega"]'
 
   RUN npm version --allow-same-version --git-tag-version false --commit-hooks false 1.0.0
   RUN npm install

diff --git a/deploy/codebase/ci-build.sh b/deploy/codebase/ci-build.sh
@@ -63,7 +63,8 @@ cp -a $MACHINE_DIR/exec $TARGET_MACHINE_DIR
 cp $MACHINE_DIR/bin/lamassu-machine $TARGET_MACHINE_DIR/bin
 cp $MACHINE_DIR/bin/cam.js $TARGET_MACHINE_DIR/bin
 cp -r $MACHINE_DIR/ui $TARGET_MACHINE_DIR
-$MACHINE_DIR/node_modules/.bin/copy-node-modules $MACHINE_DIR $TARGET_MACHINE_DIR
+cp -r $MACHINE_DIR/node_modules $TARGET_MACHINE_DIR
+npm i --omit dev --prefix $TARGET_MACHINE_DIR
 
 # Fonts setup
 mkdir -p $TARGET_MACHINE_DIR/ui/css/fonts