Browse Source

package/ci: it might be good to *actually use* the job limiters, heh.

And here I was wondering why even -j8 isn't low enough. F.
pull/525/head
Vladimír Vondruš 4 years ago
parent
commit
23f2eae702
  1. 15
      package/ci/circleci.yml
  2. 2
      package/ci/emscripten.sh
  3. 2
      package/ci/unix-desktop-vulkan.sh

15
package/ci/circleci.yml

@ -54,9 +54,9 @@ commands:
parameters: parameters:
count: count:
type: integer type: integer
# It reports 36 cores and ninja goes with 38 currently, still randomly # It reports 36 cores and ninja goes with 38 currently, RAM fluctuates
# dies with 24. RAM fluctuates from 10 to 20 GB. # from 3 to 70 GB.
default: 16 default: 24
steps: steps:
- run: - run:
name: Query CPU cores, default Ninja parallelism and available RAM, cap jobs name: Query CPU cores, default Ninja parallelism and available RAM, cap jobs
@ -256,6 +256,11 @@ jobs:
steps: steps:
- install-base-linux: - install-base-linux:
extra: cmake libsdl2-dev libglfw3-dev libvulkan-dev wget unzip extra: cmake libsdl2-dev libglfw3-dev libvulkan-dev wget unzip
# It crashes with the default setting. Only on GCC, usually when the huge
# TradeAbstractImporterTest / TradeMaterialDataTest / TradeSceneDataTest
# get involved.
# TODO: revisit when we get rid of more STL
- cap-ninja-jobs
- install-swiftshader-vulkan: - install-swiftshader-vulkan:
build: ubuntu-18.04 build: ubuntu-18.04
- build: - build:
@ -466,8 +471,6 @@ jobs:
TARGET_GLES2: "ON" TARGET_GLES2: "ON"
steps: steps:
- install-base-linux - install-base-linux
# The build is extremely flaky lately (Mar 2021). Not sure why it wasn't a
# problem before.
- cap-ninja-jobs - cap-ninja-jobs
- build: - build:
script: emscripten.sh script: emscripten.sh
@ -479,8 +482,6 @@ jobs:
TARGET_GLES2: "OFF" TARGET_GLES2: "OFF"
steps: steps:
- install-base-linux - install-base-linux
# The build is extremely flaky lately (Mar 2021). Not sure why it wasn't a
# problem before.
- cap-ninja-jobs - cap-ninja-jobs
- build: - build:
script: emscripten.sh script: emscripten.sh

2
package/ci/emscripten.sh

@ -70,7 +70,7 @@ cmake .. \
-DBUILD_GL_TESTS=ON \ -DBUILD_GL_TESTS=ON \
-DTARGET_GLES2=$TARGET_GLES2 \ -DTARGET_GLES2=$TARGET_GLES2 \
-G Ninja -G Ninja
ninja ninja $NINJA_JOBS
# Test # Test
CORRADE_TEST_COLOR=ON ctest -V -E "GLTest|GLBenchmark|ALTest" CORRADE_TEST_COLOR=ON ctest -V -E "GLTest|GLBenchmark|ALTest"

2
package/ci/unix-desktop-vulkan.sh

@ -69,7 +69,7 @@ cmake .. \
-DBUILD_VK_TESTS=ON \ -DBUILD_VK_TESTS=ON \
-DBUILD_DEPRECATED=$BUILD_DEPRECATED \ -DBUILD_DEPRECATED=$BUILD_DEPRECATED \
-G Ninja -G Ninja
ninja ninja $NINJA_JOBS
export VK_ICD_FILENAMES=$HOME/swiftshader/share/vulkan/icd.d/vk_swiftshader_icd.json export VK_ICD_FILENAMES=$HOME/swiftshader/share/vulkan/icd.d/vk_swiftshader_icd.json
export CORRADE_TEST_COLOR=ON export CORRADE_TEST_COLOR=ON

Loading…
Cancel
Save