Github actions cmake compilation.

gmarcais · Jun 16, 2023 · c6bb25c · c6bb25c
1 parent dc25494
commit c6bb25c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -14,22 +14,29 @@ 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
       with:
         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
@@ -24,4 +24,4 @@ clean-local-check:
 	rm -f *_tmp
 
 # CMake support
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST += CMakeLists.txt