From 27b0867d7354fcbcaf86993806b93a286ef60a64 Mon Sep 17 00:00:00 2001 From: Sandro Elsweijer <49643115+sandro-elsweijer@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:58:25 +0200 Subject: [PATCH 1/2] Revert "Enable parallel tests in cmake ci" --- .github/workflows/tests_cmake_sc_p4est.yml | 8 ++++---- .github/workflows/tests_cmake_t8code.yml | 4 ++-- .github/workflows/tests_cmake_t8code_linkage.yml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests_cmake_sc_p4est.yml b/.github/workflows/tests_cmake_sc_p4est.yml index cf609c314f..fe3ab95796 100644 --- 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 && ctest $MAKEFLAGS + run: cd $SC_DEBUG && ninja test $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 && ctest $MAKEFLAGS + run: cd $SC_RELEASE && ninja test $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 && ctest $MAKEFLAGS + run: cd $P4EST_DEBUG && ninja test $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 && ctest $MAKEFLAGS + run: cd $P4EST_RELEASE && ninja test $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 index 0dff77b194..8e29cd92fc 100644 --- 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: ctest - run: cd build && ctest $MAKEFLAGS + - name: ninja test + run: cd build && ninja test $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 index fdce2ddbff..f5b73414be 100644 --- 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: ctest - run: cd build_netcdf && ctest $MAKEFLAGS + - name: ninja test + run: cd build_netcdf && ninja test $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: ctest - run: cd build_occ && ctest $MAKEFLAGS + - name: ninja test + run: cd build_occ && ninja test $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: ctest - run: cd build_vtk && ctest $MAKEFLAGS + - name: ninja test + run: cd build_vtk && ninja test $MAKEFLAGS - name: OnFailUploadLog if: failure() uses: actions/upload-artifact@v4 From 17560e784bc2576c16ce760d2b6120e052ea8749 Mon Sep 17 00:00:00 2001 From: Sandro Elsweijer Date: Fri, 23 Aug 2024 12:06:29 +0200 Subject: [PATCH 2/2] remove makeflags from ninja test to avoid confusion --- .github/workflows/tests_cmake_sc_p4est.yml | 8 ++++---- .github/workflows/tests_cmake_t8code.yml | 2 +- .github/workflows/tests_cmake_t8code_linkage.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests_cmake_sc_p4est.yml b/.github/workflows/tests_cmake_sc_p4est.yml index fe3ab95796..15efd0db5b 100644 --- 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 && ninja test - 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 && ninja test - 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 && ninja test - 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 && ninja test - 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 index 8e29cd92fc..5f6e45ade8 100644 --- a/.github/workflows/tests_cmake_t8code.yml +++ b/.github/workflows/tests_cmake_t8code.yml @@ -103,7 +103,7 @@ jobs: - name: ninja install run: cd build && ninja install $MAKEFLAGS - name: ninja test - run: cd build && ninja test $MAKEFLAGS + run: cd build && ninja test - 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 index f5b73414be..df83c47b97 100644 --- a/.github/workflows/tests_cmake_t8code_linkage.yml +++ b/.github/workflows/tests_cmake_t8code_linkage.yml @@ -102,7 +102,7 @@ jobs: - name: ninja install run: cd build_netcdf && ninja install $MAKEFLAGS - name: ninja test - run: cd build_netcdf && ninja test $MAKEFLAGS + run: cd build_netcdf && ninja test - name: OnFailUploadLog if: failure() uses: actions/upload-artifact@v4 @@ -127,7 +127,7 @@ jobs: - name: ninja install run: cd build_occ && ninja install $MAKEFLAGS - name: ninja test - run: cd build_occ && ninja test $MAKEFLAGS + run: cd build_occ && ninja test - name: OnFailUploadLog if: failure() uses: actions/upload-artifact@v4 @@ -152,7 +152,7 @@ jobs: - name: ninja install run: cd build_vtk && ninja install $MAKEFLAGS - name: ninja test - run: cd build_vtk && ninja test $MAKEFLAGS + run: cd build_vtk && ninja test - name: OnFailUploadLog if: failure() uses: actions/upload-artifact@v4