Merge branch 'main' into feature-cmake_CI_with_submodules

DLR-AMR · Aug 23, 2024 · 3d4a29f · 3d4a29f
2 parents 7a48f8b + 4abab5b
commit 3d4a29f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/tests_cmake_sc_p4est.yml b/.github/workflows/tests_cmake_sc_p4est.yml
@@ -82,7 +82,7 @@ jobs:
         && echo P4EST_RELEASE="$P4EST_RELEASE" >> $GITHUB_ENV
     ## sc debug
     - name: sc debug check
-      run: cd $SC_DEBUG && ninja test $MAKEFLAGS
+      run: cd $SC_DEBUG && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4
@@ -91,7 +91,7 @@ jobs:
         path: $SC_DEBUG/Testing/Temporary/LastTest.log
       ## sc release
     - name: sc release check
-      run: cd $SC_RELEASE && ninja test $MAKEFLAGS
+      run: cd $SC_RELEASE && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4
@@ -103,7 +103,7 @@ jobs:
 #
       ## p4est debug
     - name: p4est debug check
-      run: cd $P4EST_DEBUG && ninja test $MAKEFLAGS
+      run: cd $P4EST_DEBUG && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4
@@ -112,7 +112,7 @@ jobs:
         path: $P4EST_DEBUG/Testing/Temporary/LastTest.log
       ## p4est release
     - name: p4est release check
-      run: cd $P4EST_RELEASE && ninja test $MAKEFLAGS
+      run: cd $P4EST_RELEASE && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4

diff --git a/.github/workflows/tests_cmake_t8code.yml b/.github/workflows/tests_cmake_t8code.yml
@@ -102,8 +102,8 @@ jobs:
       run: cd build && ninja $MAKEFLAGS
     - name: ninja install
       run: cd build && ninja install $MAKEFLAGS
-    - name: ninja test
-      run: cd build && ninja test $MAKEFLAGS
+    - name: ctest
+      run: cd build && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4

diff --git a/.github/workflows/tests_cmake_t8code_linkage.yml b/.github/workflows/tests_cmake_t8code_linkage.yml
@@ -101,8 +101,8 @@ jobs:
       run: cd build_netcdf && ninja $MAKEFLAGS
     - name: ninja install
       run: cd build_netcdf && ninja install $MAKEFLAGS
-    - name: ninja test
-      run: cd build_netcdf && ninja test $MAKEFLAGS
+    - name: ctest
+      run: cd build_netcdf && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4
@@ -126,8 +126,8 @@ jobs:
       run: cd build_occ && ninja $MAKEFLAGS
     - name: ninja install
       run: cd build_occ && ninja install $MAKEFLAGS
-    - name: ninja test
-      run: cd build_occ && ninja test $MAKEFLAGS
+    - name: ctest
+      run: cd build_occ && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4
@@ -151,8 +151,8 @@ jobs:
       run: cd build_vtk && ninja $MAKEFLAGS
     - name: ninja install
       run: cd build_vtk && ninja install $MAKEFLAGS
-    - name: ninja test
-      run: cd build_vtk && ninja test $MAKEFLAGS
+    - name: ctest
+      run: cd build_vtk && ctest $MAKEFLAGS
     - name: OnFailUploadLog
       if: failure()
       uses: actions/upload-artifact@v4

diff --git a/pull_request_template.md b/pull_request_template.md
@@ -33,6 +33,6 @@ As a reviewer please read through all the code lines and make sure that the code
 - [ ] If a new directory with source-files is added, it must be covered by the `script/find_all_source_files.scp` to check the indentation of these files.
 - [ ] If this PR introduces a new feature, it must be covered in an example/tutorial and a Wiki article.
 
-#### Licence
+#### License
 
 - [ ] The author added a BSD statement to `doc/` (or already has one)