From 0a12914e0d7bf7213610ae624f5276845bde6b67 Mon Sep 17 00:00:00 2001 From: James Upjohn Date: Sun, 13 Mar 2022 00:25:35 +1300 Subject: [PATCH] chore: use system logical core count for Ubuntu/macOS builds (#3602) Co-authored-by: Rasmus Karlsson --- .github/workflows/build.yml | 8 ++++---- CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a53e6a208..624ce4636 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,7 +153,7 @@ jobs: mkdir build cd build qmake PREFIX=/usr .. - make -j8 + make -j$(nproc) shell: bash - name: Build with CMake (Ubuntu) @@ -167,7 +167,7 @@ jobs: -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \ -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \ .. - make -j8 + make -j$(nproc) shell: bash - name: Package - AppImage (Ubuntu) @@ -211,7 +211,7 @@ jobs: mkdir build cd build $Qt5_DIR/bin/qmake .. DEFINES+=$dateOfBuild - make -j8 + make -j$(sysctl -n hw.logicalcpu) shell: bash - name: Build with CMake (MacOS) @@ -224,7 +224,7 @@ jobs: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \ .. - make -j8 + make -j$(sysctl -n hw.logicalcpu) shell: bash - name: Package (MacOS) diff --git a/CHANGELOG.md b/CHANGELOG.md index 546f9c2ae..9a2b34155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -110,6 +110,7 @@ - Dev: Added CMake build option `BUILD_WITH_QTKEYCHAIN` to build with or without Qt5Keychain support (On by default). (#3318) - Dev: Added /fakemsg command for debugging (#3448) - Dev: Notebook::select\* functions now take an optional `focusPage` parameter (true by default) which keeps the default behaviour of selecting the page after it has been selected. If set to false, the page is _not_ focused after being selected. (#3446) +- Dev: Use system logical core count for Ubuntu/macOS GitHub actions builds. (#3602) ## 2.3.4