From 6a3402be5f4ac1f8d91c390505aa7232311b4865 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Mon, 1 Oct 2018 18:50:41 -0700 Subject: [PATCH] ci: add -j3 to mksnapshot/ffmpeg due to smaller machine size (#14907) --- .circleci/config.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d8cb06589bde..a1dff76cd1f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -228,7 +228,9 @@ step-ffmpeg-build: &step-ffmpeg-build name: Non proprietary ffmpeg build command: | cd src - ninja -C out/ffmpeg electron:electron_ffmpeg_zip + # NOTE(jeremy): -j3 because ffmpeg is currently built on a smaller + # machine size and ninja mis-detects the number of CPUs available. + ninja -C out/ffmpeg electron:electron_ffmpeg_zip -j3 step-verify-ffmpeg: &step-verify-ffmpeg run: @@ -264,7 +266,9 @@ step-mksnapshot-build: &step-mksnapshot-build name: mksnapshot build command: | cd src - ninja -C out/Default electron:electron_mksnapshot_zip + # NOTE(jeremy): -j3 because mksnapshot is currently built on a smaller + # machine size and ninja mis-detects the number of CPUs available. + ninja -C out/Default electron:electron_mksnapshot_zip -j3 step-mksnapshot-store: &step-mksnapshot-store store_artifacts: @@ -298,7 +302,9 @@ step-maybe-native-mksnapshot-build: &step-maybe-native-mksnapshot-build command: | if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then cd src - ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip + # NOTE(jeremy): -j3 because mksnapshot is currently built on a smaller + # machine size and ninja mis-detects the number of CPUs available. + ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j3 else echo 'Skipping native mksnapshot build for non arm build' fi