aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci/build-vulkantools.sh
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-02-11 15:44:56 -0800
committerMarge Bot <[email protected]>2020-04-01 18:33:58 +0000
commitc1e7e83d52d912b9a1ba5009e8f84d737c1e0d21 (patch)
tree51ac199fc5eb04d148e5366ebe9c07debd77b293 /.gitlab-ci/build-vulkantools.sh
parent2f424c83e072f6a21d15af1064f6e744e801fbfa (diff)
ci: Consistently use -j4 across x86 build jobs and -j8 on ARM.
Our shared runners are set up for concurrent jobs ~= CPUs / 4 (x86) or 8 (ARM). If you use more build processes than that, then jobs may be fighting each other for shared system resources, possibly to the point of failure (we've seen one of the runners OOM on some jobs before, though I'm not sure if this was the cause). To try to systematically prevent the problem, we make a ninja wrapper in the containers that passes the -j flags, and set MAKEFLAGS in the container builds. This doesn't cover make in non-container builds, but I believe we don't have any of those. Reviewed-by: Michel Dänzer <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3782> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3782>
Diffstat (limited to '.gitlab-ci/build-vulkantools.sh')
-rw-r--r--.gitlab-ci/build-vulkantools.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/build-vulkantools.sh b/.gitlab-ci/build-vulkantools.sh
index f1fc64aef4c..099d362550f 100644
--- a/.gitlab-ci/build-vulkantools.sh
+++ b/.gitlab-ci/build-vulkantools.sh
@@ -19,7 +19,7 @@ cmake -G Ninja -B_build -H. \
-DBUILD_VIA=OFF \
-DBUILD_VKTRACE_REPLAY=OFF \
-C_build/helper.cmake
-ninja -C _build -j4 VkLayer_screenshot VkLayer_screenshot-staging-json
+ninja -C _build VkLayer_screenshot VkLayer_screenshot-staging-json
mkdir -p build/etc/vulkan/explicit_layer.d
mkdir build/lib
install _build/layersvt/staging-json/VkLayer_screenshot.json build/etc/vulkan/explicit_layer.d