From d2fbf186ed3c96cc39d5e037e71e83ae94904d6b Mon Sep 17 00:00:00 2001
From: Thomas Padioleau <thomas.padioleau@cea.fr>
Date: Wed, 8 Jan 2025 18:57:18 +0100
Subject: [PATCH] Update gyselalibxx workflow

---
 .github/workflows/gyselalibxx.yml | 46 ++++++++++++-------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/gyselalibxx.yml b/.github/workflows/gyselalibxx.yml
index ea45c2247..b169a82ce 100644
--- a/.github/workflows/gyselalibxx.yml
+++ b/.github/workflows/gyselalibxx.yml
@@ -6,6 +6,10 @@ name: gyselalibxx
 on: workflow_dispatch
 jobs:
   tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        cmake_build_type: ['Debug', 'Release']
     runs-on: ubuntu-latest
     steps:
     - name: Checkout gyselalibxx
@@ -18,42 +22,26 @@ jobs:
     - name: Checkout ddc
       uses: actions/checkout@v4
       with:
-        submodules: recursive
+        submodules: true
         path: vendor/ddc
     - name: Build
       run: |
         cat<<-EOF > run.sh
           set -xe
           git config --global --add safe.directory /src/vendor/kokkos
-          cmake -DCMAKE_CXX_FLAGS=-Wall -DBUILD_BENCHMARKS=ON -B build -S /src
-          cmake --build build --parallel 2 --verbose
+
+          export CMAKE_BUILD_PARALLEL_LEVEL=4
+          export CMAKE_BUILD_TYPE=${{matrix.cmake_build_type}}
+
+          cmake \
+            -DGYSELALIBXX_DEFAULT_CXX_FLAGS="" \
+            -B build \
+            -S /src
+
+          cmake --build build
+
           ctest --test-dir build --output-on-failure --timeout 5 -LE test_on_Release_only
         EOF
-        docker run -v ${PWD}:/src:ro ghcr.io/gyselax/voicexx_env bash /src/run.sh
-      continue-on-error: true
-  tests_Release:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout gyselalibxx
-      uses: actions/checkout@v4
-      with:
-        repository: gyselax/gyselalibxx
-        submodules: recursive
-    - name: rm ddc
-      run: rm -rf vendor/ddc
-    - name: Checkout ddc
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-        path: vendor/ddc
-    - name: Build
-      run: |
-        cat<<-EOF > run.sh
-          set -xe
-          git config --global --add safe.directory /src/vendor/kokkos
-          cmake -DCMAKE_CXX_FLAGS=-Wall -DBUILD_BENCHMARKS=ON -DCMAKE_BUILD_TYPE=Release -B build -S /src
-          cmake --build build --parallel 2 --verbose
-          ctest --test-dir build --output-on-failure --timeout 5
-        EOF
+
         docker run -v ${PWD}:/src:ro ghcr.io/gyselax/voicexx_env bash /src/run.sh
       continue-on-error: true