Skip to content

Commit

Permalink
don't test for wasm-tbb
Browse files Browse the repository at this point in the history
  • Loading branch information
pca006132 committed Nov 28, 2024
1 parent 3d42046 commit 8080796
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/manifold.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,12 @@ jobs:
cd build
emcmake cmake -DCMAKE_BUILD_TYPE=Release -DMANIFOLD_PAR=${{matrix.parallelization}} .. && emmake make
- name: Test WASM
if: matrix.parallelization == 'OFF'
run: |
cd build/test
node ./manifold_test.js
- name: Test examples
if: matrix.parallelization == 'OFF'
run: |
cd bindings/wasm/examples
npm ci
Expand Down
17 changes: 11 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,12 @@
buildPhase = ''
emmake make -j''${NIX_BUILD_CORES}
'';
checkPhase = if doCheck then ''
cd test
node manifold_test.js
cd ../
'' else "";
checkPhase =
if doCheck then ''
cd test
node manifold_test.js
cd ../
'' else "";
installPhase = ''
mkdir -p $out
cp bindings/wasm/manifold.* $out/
Expand All @@ -150,7 +151,11 @@
manifold-tbb = manifold { };
manifold-none = manifold { parallel = false; };
manifold-js = manifold-emscripten { };
manifold-js-tbb = manifold-emscripten { parallel = true; };
manifold-js-tbb = manifold-emscripten {
parallel = true;
doCheck =
false;
};
# but how should we make it work with other python versions?
manifold3d = with pkgs.python3Packages; buildPythonPackage {
pname = "manifold3d";
Expand Down

0 comments on commit 8080796

Please sign in to comment.