Don't use nproc on CI; it returns host threads

This commit is contained in:
Charles J. Cliffe 2023-03-29 00:10:20 -04:00
parent b3428c3ba8
commit 165ace2c37
5 changed files with 5 additions and 5 deletions

View File

@ -3,7 +3,7 @@ jobs:
build: build:
docker: docker:
- image: cimg/base:current-22.04 - image: cimg/base:current-22.04
resource_class: large resource_class: medium
environment: environment:
- CACHE_DIR: ~/build/wxWidgets/staticlib - CACHE_DIR: ~/build/wxWidgets/staticlib
steps: steps:

View File

@ -2,4 +2,4 @@
mkdir -p $HOME/build/cjcliffe/CubicSDR-build mkdir -p $HOME/build/cjcliffe/CubicSDR-build
cd $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 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

View File

@ -10,5 +10,5 @@ echo "Configuring liquid-dsp.."
./configure > /dev/null ./configure > /dev/null
echo "Building liquid-dsp.." echo "Building liquid-dsp.."
make -j$(nproc) > /dev/null make -j2 > /dev/null
sudo make install sudo make install

View File

@ -8,6 +8,6 @@ cd $HOME/build/pothosware/SoapySDR-build
cmake $HOME/build/pothosware/SoapySDR -DCMAKE_BUILD_TYPE=Release cmake $HOME/build/pothosware/SoapySDR -DCMAKE_BUILD_TYPE=Release
echo "Building SoapySDR.." echo "Building SoapySDR.."
make -j$(nproc) > /dev/null make -j2 > /dev/null
sudo make install sudo make install

View File

@ -25,5 +25,5 @@ elif [ "$(uname)" == "Darwin" ]; then
fi fi
echo "Building wxWidgets.." echo "Building wxWidgets.."
make V=1 -j$(nproc) make V=1 -j2
make install make install