From 165ace2c37e796c964efe8b573ebba7ad3789db0 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 29 Mar 2023 00:10:20 -0400 Subject: [PATCH] Don't use nproc on CI; it returns host threads --- .circleci/config.yml | 2 +- .circleci/scripts/build_cubicsdr.sh | 2 +- .circleci/scripts/build_liquiddsp.sh | 2 +- .circleci/scripts/build_soapysdr.sh | 2 +- .circleci/scripts/build_wxwidgets.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0c513d..5af5c49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: docker: - image: cimg/base:current-22.04 - resource_class: large + resource_class: medium environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: diff --git a/.circleci/scripts/build_cubicsdr.sh b/.circleci/scripts/build_cubicsdr.sh index 138a470..8c724ac 100644 --- a/.circleci/scripts/build_cubicsdr.sh +++ b/.circleci/scripts/build_cubicsdr.sh @@ -2,4 +2,4 @@ mkdir -p $HOME/build/cjcliffe/CubicSDR-build cd $HOME/build/cjcliffe/CubicSDR-build cmake ~/project -DCMAKE_BUILD_TYPE=Release -DwxWidgets_CONFIG_EXECUTABLE=$HOME/build/wxWidgets/staticlib/bin/wx-config -DUSE_HAMLIB=1 -DENABLE_DIGITAL_LAB=1 -make -j$(nproc) +make -j2 diff --git a/.circleci/scripts/build_liquiddsp.sh b/.circleci/scripts/build_liquiddsp.sh index 470ccd8..07cbe26 100644 --- a/.circleci/scripts/build_liquiddsp.sh +++ b/.circleci/scripts/build_liquiddsp.sh @@ -10,5 +10,5 @@ echo "Configuring liquid-dsp.." ./configure > /dev/null echo "Building liquid-dsp.." -make -j$(nproc) > /dev/null +make -j2 > /dev/null sudo make install diff --git a/.circleci/scripts/build_soapysdr.sh b/.circleci/scripts/build_soapysdr.sh index 1901337..3cc8d82 100644 --- a/.circleci/scripts/build_soapysdr.sh +++ b/.circleci/scripts/build_soapysdr.sh @@ -8,6 +8,6 @@ cd $HOME/build/pothosware/SoapySDR-build cmake $HOME/build/pothosware/SoapySDR -DCMAKE_BUILD_TYPE=Release echo "Building SoapySDR.." -make -j$(nproc) > /dev/null +make -j2 > /dev/null sudo make install diff --git a/.circleci/scripts/build_wxwidgets.sh b/.circleci/scripts/build_wxwidgets.sh index e3fad14..c4ef42f 100644 --- a/.circleci/scripts/build_wxwidgets.sh +++ b/.circleci/scripts/build_wxwidgets.sh @@ -25,5 +25,5 @@ elif [ "$(uname)" == "Darwin" ]; then fi echo "Building wxWidgets.." -make V=1 -j$(nproc) +make V=1 -j2 make install