From b88f02b776fadd06db3a48a8923b2a32280a9107 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Mon, 23 Sep 2024 15:33:41 +0200 Subject: [PATCH] Replace nproc on MacOS Signed-off-by: yubiuser --- .github/workflows/cibuild.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index 5150cd13..d8e1cc6c 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -393,7 +393,16 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4.1.7 - + + - name: Export number of CPUs + run: | + if [ "$RUNNER_OS" == "Linux" ]; then + echo "cores=$(nproc)" >> $GITHUB_ENV + fi + if [ "$RUNNER_OS" == "macOS" ]; then + echo "cores=$(sysctl -n hw.logicalcpu)" >> $GITHUB_ENV + fi + - name: Install clang on Linux if: matrix.compiler == 'clang' && startsWith(matrix.os,'ubuntu') run: | @@ -448,8 +457,8 @@ jobs: cd openssl-1.1.1w ./config --prefix=/usr/local/ssl1.1 --openssldir=/usr/local/ssl1.1 shared make depend - make -j $(nproc) - sudo make install_sw -j $(nproc) + make -j ${{ env.cores }} + sudo make install_sw -j ${{ env.cores }} sudo ldconfig OPENSSL_ROOT_DIR=/usr/local/ssl1.1 @@ -502,11 +511,11 @@ jobs: - name: Build MacOS Package if: matrix.env.MACOSX_PACKAGE == 1 run: | - make -f Makefile.osx package -j $(nproc) + make -f Makefile.osx package -j ${{ env.cores }} - name: Build executable run: | - cmake --build output -- -j $(nproc) + cmake --build output -- -j ${{ env.cores }} - name: Check executable run: | @@ -527,4 +536,4 @@ jobs: # Run unit tests gcc unittest/cgi_test.c -o output/cgi_test.cgi cd output - CTEST_OUTPUT_ON_FAILURE=1 CK_FORK=yes make all test -j $(nproc) \ No newline at end of file + CTEST_OUTPUT_ON_FAILURE=1 CK_FORK=yes make all test -j ${{ env.cores }} \ No newline at end of file