Browse Source

package/ci: use Node.js 18 on the WebGL 2 build to test WASM SIMD.

Matches the change done in Corrade.
pull/651/head
Vladimír Vondruš 2 years ago
parent
commit
1084a16362
  1. 27
      package/ci/circleci.yml
  2. 2
      package/ci/emscripten.sh

27
package/ci/circleci.yml

@ -175,6 +175,25 @@ commands:
ls -l /usr/bin/llvm-symbolizer-6.0 ls -l /usr/bin/llvm-symbolizer-6.0
ln -s /usr/bin/llvm-symbolizer{-6.0,} ln -s /usr/bin/llvm-symbolizer{-6.0,}
install-nodejs:
parameters:
version:
type: string
default: "18"
steps:
- run:
name: Install Node.js << parameters.version >>
# cd'ing to the home directory as otherwise it'd download into
# /root/project and a checkout would then fail because it's not empty.
# Also emsdk forces the PATH to prefer its own nodejs, so explicitly
# call /usr/bin/node.
command: |
cd ~
curl -fsSL https://deb.nodesource.com/setup_<< parameters.version >>.x -o nodesource_setup.sh
bash nodesource_setup.sh
apt-get install -y nodejs
/usr/bin/node -v
install-cmake: install-cmake:
parameters: parameters:
version: version:
@ -650,8 +669,14 @@ jobs:
environment: environment:
# STUPID yml interprets unquoted OFF as a boolean # STUPID yml interprets unquoted OFF as a boolean
TARGET_GLES2: "OFF" TARGET_GLES2: "OFF"
# emsdk forces the PATH to prefer its own nodejs, so explicitly force
# /usr/bin/node to be used by CMake
EXTRA_OPTS: >
-DNODEJS_EXECUTABLE=/usr/bin/node
steps: steps:
- install-base-linux - install-base-linux:
extra: curl
- install-nodejs
# With a Debug build, 8+ is causing OOMs. Release was fine with 24. # With a Debug build, 8+ is causing OOMs. Release was fine with 24.
- cap-ninja-jobs: - cap-ninja-jobs:
count: 4 count: 4

2
package/ci/emscripten.sh

@ -12,6 +12,7 @@ cmake .. \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCORRADE_WITH_INTERCONNECT=OFF \ -DCORRADE_WITH_INTERCONNECT=OFF \
$EXTRA_OPTS \
-G Ninja -G Ninja
ninja install ninja install
cd .. cd ..
@ -53,6 +54,7 @@ cmake .. \
-DMAGNUM_BUILD_AL_TESTS=ON \ -DMAGNUM_BUILD_AL_TESTS=ON \
-DMAGNUM_BUILD_GL_TESTS=ON \ -DMAGNUM_BUILD_GL_TESTS=ON \
-DMAGNUM_TARGET_GLES2=$TARGET_GLES2 \ -DMAGNUM_TARGET_GLES2=$TARGET_GLES2 \
$EXTRA_OPTS \
-G Ninja -G Ninja
ninja $NINJA_JOBS ninja $NINJA_JOBS

Loading…
Cancel
Save