From 5aa49fcebe309a325f4fe2260070294f3b945868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 19 Oct 2024 22:35:20 +0200 Subject: [PATCH] package/ci: build Debug on Emscripten. So we can catch all the OOB errors without just crashing or misbehaving in a nasty way. --- package/ci/circleci.yml | 8 ++++++-- package/ci/emscripten.sh | 8 ++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index 7b900fc57..7abddeeaf 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -637,7 +637,9 @@ jobs: TARGET_GLES2: "ON" steps: - install-base-linux - - cap-ninja-jobs + # With a Debug build, 16+ is causing OOMs. Release was fine with 24. + - cap-ninja-jobs: + count: 8 - build: script: emscripten.sh @@ -648,7 +650,9 @@ jobs: TARGET_GLES2: "OFF" steps: - install-base-linux - - cap-ninja-jobs + # With a Debug build, 8+ is causing OOMs. Release was fine with 24. + - cap-ninja-jobs: + count: 4 - build: script: emscripten.sh diff --git a/package/ci/emscripten.sh b/package/ci/emscripten.sh index 8062283ff..297e8b591 100755 --- a/package/ci/emscripten.sh +++ b/package/ci/emscripten.sh @@ -9,9 +9,7 @@ cd corrade mkdir build-emscripten && cd build-emscripten cmake .. \ -DCMAKE_TOOLCHAIN_FILE="../../toolchains/generic/Emscripten-wasm.cmake" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \ - -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \ + -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCORRADE_WITH_INTERCONNECT=OFF \ -G Ninja @@ -24,9 +22,7 @@ cd .. mkdir build-emscripten && cd build-emscripten cmake .. \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten-wasm.cmake" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \ - -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \ + -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_FIND_ROOT_PATH=$HOME/deps \ -DMAGNUM_WITH_AUDIO=ON \