From c6bb25c1b0cdaf7441288a1e5eca07d0fc3bf0f6 Mon Sep 17 00:00:00 2001
From: Guillaume Marcais <gmarcais@cs.cmu.edu>
Date: Fri, 16 Jun 2023 14:31:12 -0400
Subject: [PATCH] Github actions cmake compilation.

---
 .github/workflows/c-cpp.yml | 17 ++++++++++++-----
 tests/Makefile.am           |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 5f900ba..6d75e01 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -14,18 +14,19 @@ jobs:
     steps:
     - uses: ConorMacBride/install-package@v1
       with:
-        apt: libgtest-dev strace
+        apt: libgtest-dev
     - uses: actions/checkout@v3
-    - name: autoconf
+
+    - name: Build and test with autotools
       run: autoreconf -fi
     - name: configure
       run: ./configure
     - name: make
-      run: make
+      run: make -j
     - name: make check
-      run: make check
+      run: make -j check
     - name: make distcheck
-      run: make distcheck
+      run: make -j distcheck
     - name: Archive testing logs
       if: '!cancelled()'
       uses: actions/upload-artifact@v3
@@ -33,3 +34,9 @@ jobs:
         name: gtest-logs
         path: '**/*.log'
         retention-days: 1
+
+    - name: Build and test with CMake
+      uses: threeal/cmake-action@latest
+      with:
+        args: -DNOSHELL_BUILD_TESTS=ON
+        run-test: true
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b9b2dc9..73d092b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,4 +24,4 @@ clean-local-check:
 	rm -f *_tmp
 
 # CMake support
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST += CMakeLists.txt