chore: use system logical core count for Ubuntu/macOS builds (#3602)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
James Upjohn 2022-03-13 00:25:35 +13:00 committed by GitHub
parent 5a89acbe82
commit 0a12914e0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View file

@ -153,7 +153,7 @@ jobs:
mkdir build mkdir build
cd build cd build
qmake PREFIX=/usr .. qmake PREFIX=/usr ..
make -j8 make -j$(nproc)
shell: bash shell: bash
- name: Build with CMake (Ubuntu) - name: Build with CMake (Ubuntu)
@ -167,7 +167,7 @@ jobs:
-DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \ -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
-DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \ -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \
.. ..
make -j8 make -j$(nproc)
shell: bash shell: bash
- name: Package - AppImage (Ubuntu) - name: Package - AppImage (Ubuntu)
@ -211,7 +211,7 @@ jobs:
mkdir build mkdir build
cd build cd build
$Qt5_DIR/bin/qmake .. DEFINES+=$dateOfBuild $Qt5_DIR/bin/qmake .. DEFINES+=$dateOfBuild
make -j8 make -j$(sysctl -n hw.logicalcpu)
shell: bash shell: bash
- name: Build with CMake (MacOS) - name: Build with CMake (MacOS)
@ -224,7 +224,7 @@ jobs:
-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
-DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \ -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \
.. ..
make -j8 make -j$(sysctl -n hw.logicalcpu)
shell: bash shell: bash
- name: Package (MacOS) - name: Package (MacOS)

View file

@ -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 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: 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: 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 ## 2.3.4