Updating CI with macos build

compiler-research · Sep 30, 2023 · 1b600b2 · 1b600b2
1 parent 9f0b9b4
commit 1b600b2
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -198,14 +198,17 @@ jobs:
                 -DCLANG_ENABLE_FORMAT=OFF                     \
                 -DCLANG_ENABLE_BOOTSTRAP=OFF                  \
                 ../llvm
-          # cmake --build . --target clang --parallel $(sysctl -n hw.physicalcpu)
-          # cmake --build . --target cling --parallel $(sysctl -n hw.physicalcpu)
-          # # Now build gtest.a and gtest_main for CppInterOp to run its tests.
-          # cmake --build . --target gtest_main --parallel $(sysctl -n hw.physicalcpu)
-          cmake --build . --target clang --parallel ${{ env.ncpus }}
-          cmake --build . --target cling --parallel ${{ env.ncpus }}
-          # Now build gtest.a and gtest_main for CppInterOp to run its tests.
-          cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
+          if [[ "${os}" == "macos*" ]]; then
+            cmake --build . --target clang --parallel $(sysctl -n hw.ncpu)
+            cmake --build . --target cling --parallel $(sysctl -n hw.ncpu)
+            # Now build gtest.a and gtest_main for CppInterOp to run its tests.
+            cmake --build . --target gtest_main --parallel $(sysctl -n hw.ncpu)
+          else
+            cmake --build . --target clang --parallel $(nproc --all)
+            cmake --build . --target cling --parallel $(nproc --all)
+            # Now build gtest.a and gtest_main for CppInterOp to run its tests.
+            cmake --build . --target gtest_main --parallel $(nproc --all)
+          fi
         else
           cmake -DLLVM_ENABLE_PROJECTS=clang                  \
                 -DLLVM_TARGETS_TO_BUILD="host;NVPTX"          \
@@ -216,8 +219,11 @@ jobs:
                 -DCLANG_ENABLE_FORMAT=OFF                     \
                 -DCLANG_ENABLE_BOOTSTRAP=OFF                  \
                 ../llvm
-          # cmake --build . --target clang clang-repl --parallel $(sysctl -n hw.physicalcpu)
-          cmake --build . --target clang clang-repl --parallel ${{ env.ncpus }}
+          if [[ "${os}" == "macos*" ]]; then
+            cmake --build . --target clang clang-repl --parallel $(sysctl -n hw.physicalcpu)
+          else
+            cmake --build . --target clang clang-repl --parallel $(nproc --all)
+          fi
         fi
         cd ../../
 
@@ -279,7 +285,11 @@ jobs:
                 ../
         fi
         os="${{ matrix.os }}"
-        cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
+        if [[ "${os}" == "macos*" ]]; then
+          cmake --build . --target check-cppinterop --parallel $(sysctl -n hw.physicalcpu)
+        else
+          cmake --build . --target check-cppinterop --parallel $(nproc --all)
+        fi
         cppyy_on=$(echo "${{ matrix.cppyy }}" | tr '[:lower:]' '[:upper:]')
         if [[ ("${cppyy_on}" != "ON") && ("${os}" = "ubuntu*") ]]; then
           valgrind --track-origins=yes --error-exitcode=1 unittests/CppInterOp/CppInterOpTests 2>&1 >/dev/null