From cded8f895411dee602c0afd122a6bf05117c1021 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 17 Jun 2025 20:11:22 +0100 Subject: [PATCH 1/2] Fix ncpus environment variable ci --- .../Miscellaneous/Select_Default_Build_Type/action.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml b/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml index 63edc4caf..1f2df8092 100644 --- a/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml +++ b/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml @@ -10,7 +10,12 @@ runs: run: | echo "BUILD_TYPE=Release" >> $GITHUB_ENV echo "CODE_COVERAGE=0" >> $GITHUB_ENV - echo "ncpus=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV + os="${{ matrix.os }}" + if [[ "${os}" != "macos"* ]]; then + echo "ncpus=$(nproc --all)" >> $GITHUB_ENV + else + echo "ncpus=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV + fi - name: Select default build type on Windows if: runner.os == 'Windows' From c7b48db34c71c4741dc156739617bf2e6d5b9bb2 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 18 Jun 2025 09:40:47 +0100 Subject: [PATCH 2/2] Update action.yml to activate workflow --- .../actions/Miscellaneous/Select_Default_Build_Type/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml b/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml index 1f2df8092..7b09c0cd4 100644 --- a/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml +++ b/.github/actions/Miscellaneous/Select_Default_Build_Type/action.yml @@ -10,8 +10,7 @@ runs: run: | echo "BUILD_TYPE=Release" >> $GITHUB_ENV echo "CODE_COVERAGE=0" >> $GITHUB_ENV - os="${{ matrix.os }}" - if [[ "${os}" != "macos"* ]]; then + if [[ "${{ matrix.os }}" != "macos"* ]]; then echo "ncpus=$(nproc --all)" >> $GITHUB_ENV else echo "ncpus=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV