Skip to content

Commit fa1cffa

Browse files
author
MarcoFalke
committed
ci: Install missing nproc in macos task
This avoids special-casing macos
1 parent faf7a2b commit fa1cffa

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
# A workaround for "The `brew link` step did not complete successfully" error.
107107
brew install --quiet python@3 || brew link --overwrite python@3
108-
brew install --quiet ninja pkg-config gnu-getopt ccache boost libevent miniupnpc zeromq qt@5 qrencode
108+
brew install --quiet coreutils ninja pkg-config gnu-getopt ccache boost libevent miniupnpc zeromq qt@5 qrencode
109109
110110
- name: Set Ccache directory
111111
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"

ci/test/03_test_script.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/l
1313
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1"
1414
export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
1515

16+
echo "Number of available processing units: $(nproc)"
1617
if [ "$CI_OS_NAME" == "macos" ]; then
1718
top -l 1 -s 0 | awk ' /PhysMem/ {print}'
18-
echo "Number of CPUs: $(sysctl -n hw.logicalcpu)"
1919
else
2020
free -m -h
21-
echo "Number of CPUs (nproc): $(nproc)"
2221
echo "System info: $(uname --kernel-name --kernel-release)"
2322
lscpu
2423
fi

0 commit comments

Comments
 (0)