Skip to content

Commit e5194e0

Browse files
eundersanderjturner65
authored andcommitted
npm-related changes to circleci config
1 parent bb0b572 commit e5194e0

1 file changed

Lines changed: 21 additions & 19 deletions

File tree

.circleci/config.yml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,8 @@ jobs:
528528
- run:
529529
name: Build Javascript bindings
530530
command: |
531-
# wait for npm and emscripten install
531+
# Wait for npm and emscripten install. Note that npm is not strictly
532+
# required (see also Run JavaScript tests in this file).
532533
while [[ ! -f ~/emscripten_installed && ! -f ~/npm_deps_installed ]]; do sleep 2; done
533534
# switch to cmake 3.20 just for this step. The JS build requires
534535
# static Bullet libs, and Bullet static libs required CMake 3.13+.
@@ -538,9 +539,8 @@ jobs:
538539
. ~/.bashrc
539540
export PATH=$HOME/miniconda/bin:$PATH
540541
. activate habitat
541-
nvm use v11.9.0
542542
. ~/emsdk/emsdk_env.sh
543-
CMAKE_GENERATOR=Ninja ./build_js.sh --bullet
543+
CMAKE_GENERATOR=Ninja ./build_js.sh --bullet --no-web-apps
544544
# switch back to cmake 3.12
545545
sudo rm /usr/local/bin/cmake
546546
sudo ln -s /opt/cmake312/bin/cmake /usr/local/bin/cmake
@@ -567,15 +567,17 @@ jobs:
567567
export PATH=$HOME/miniconda/bin:/usr/local/cuda/bin:$PATH
568568
. activate habitat; cd habitat-sim
569569
python examples/example.py --scene data/scene_datasets/habitat-test-scenes/van-gogh-room.glb --silent --test_fps_regression $FPS_THRESHOLD
570-
- run:
571-
name: Run JavaScript tests
572-
command: |
573-
cd habitat-sim
574-
. ~/.bashrc
575-
export PATH=$HOME/miniconda/bin:$PATH
576-
. activate habitat
577-
nvm use v11.9.0
578-
npm run test
570+
571+
# reference code to test our JS build using npm/html/JS
572+
# - run:
573+
# name: Run JavaScript tests
574+
# command: |
575+
# cd habitat-sim
576+
# . ~/.bashrc
577+
# export PATH=$HOME/miniconda/bin:$PATH
578+
# . activate habitat
579+
# nvm use v11.9.0
580+
# npm run test
579581
- run:
580582
name: Run sim tests
581583
no_output_timeout: 25m
@@ -608,11 +610,11 @@ jobs:
608610
./build.sh --headless --cmake-args='-DCMAKE_CXX_FLAGS="--coverage"'
609611
PYTHONPATH=src_python pytest -n 4 --durations=10 --cov-report=xml --cov=./ --cov-append tests/test_physics.py tests/test_sensors.py
610612
611-
. ~/.bashrc
612-
nvm use v11.9.0
613-
. ~/emsdk/emsdk_env.sh
614-
# Generate JS CodeConv
615-
npm run test_with_coverage
613+
# reference code to generate JS CodeConv
614+
# . ~/.bashrc
615+
# nvm use v11.9.0
616+
# . ~/emsdk/emsdk_env.sh
617+
# npm run test_with_coverage
616618
- run: &upload_coverage
617619
name: Upload test coverage
618620
command: |
@@ -624,8 +626,8 @@ jobs:
624626
#Uploading test coverage for Python code
625627
./codecov -f coverage.xml -cF Python
626628
627-
# Uploading test coverage for JS code
628-
./codecov coverage_js/coverage-final.json -cF JavaScript
629+
# reference code for uploading test coverage for JS code
630+
# ./codecov coverage_js/coverage-final.json -cF JavaScript
629631
630632
#Uploading test coverage for C++ code
631633
lcov --directory . --capture --output-file coverage.info

0 commit comments

Comments
 (0)