Merge pull request openscad#5512 from ochafik/fix-circleci-wasm

t-paul · web-flow · commit 30cbdf6c7214 · 2024-12-21T17:12:59.000+01:00
Fix circleci wasm workflows
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -88,6 +88,11 @@ jobs:
     resource_class: large
     steps:
       - checkout
+      - run:
+          name: Install latest node.js
+          command: |
+              npm i -g n
+              n latest
       - when:
           condition:
             equal: [ web, << parameters.wasm-type >> ]
@@ -99,8 +104,6 @@ jobs:
                     apt-get install -y \
                         libatk1.0-0 libatk-bridge2.0-0 libdrm2 libxcomposite1 libxdamage1 \
                         libxfixes3 libxrandr2 libgbm1 libxkbcommon0 libpango-1.0-0 libcairo2
-                    npm i -g n
-                    n latest
                     export PATH="/usr/local/bin:$PATH"
                     npm init -y
                     npm i puppeteer
@@ -136,6 +139,7 @@ jobs:
       - run:
           name: Verify OpenSCAD WASM build
           command: |
+              # node in the path (from emsdk) is too old to run the wasm build, use the one installed by n.
               export PATH="/usr/local/bin:$PATH"
               ./tests/wasm-check.sh << parameters.wasm-type >>
       - store_artifacts:
diff --git a/tests/wasm-check.html b/tests/wasm-check.html
@@ -2,7 +2,7 @@
   <body>
     <pre id="output"></pre>
     <script type="module"> 
-      import OpenSCAD from "../build/openscad.js";
+      import OpenSCAD from "../../build/openscad.js";
       
       const instance = await OpenSCAD({ noInitialRun: true });
       instance.FS.writeFile("input.scad", `
