From 1e0b281422bec5e0b729ea52d688e9fd5b28bdc1 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kefu.chai@scylladb.com>
Date: Fri, 17 May 2024 10:40:28 +0800
Subject: [PATCH] github: add 2 testing combinations back to the matrix

this change adds the combinations of

- {compiler: clang++-18, standard: 23, mode: release}
- {compiler: clang++-18, standard: 23, mode: debug}

back.

before this change, the `include` keyword instructs
github workflow to override these two combinations with
the ones which builds with dpdk and with C++20 modules.
this hurts the coverage of the test matrix.

after this change, instead of using `include` keyword,
we just add two more jobs which are dedicated for
testing these two combinations without overriding
the existing ones.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
---
 .github/workflows/tests.yaml | 71 ++++++++++++------------------------
 1 file changed, 23 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 84d2a6089a3..096cbaddfb7 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -10,8 +10,8 @@ concurrency:
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
 jobs:
-  test:
-    name: "Tests (${{ matrix.compiler }}, C++${{ matrix.standard}}, ${{ matrix.mode }}, ${{ matrix.enables }})"
+  regular_test:
+    name: "Test (${{ matrix.compiler }}, C++${{ matrix.standard}}, ${{ matrix.mode }})"
     uses: ./.github/workflows/test.yaml
     strategy:
       fail-fast: false
@@ -20,55 +20,30 @@ jobs:
         compiler: [clang++-18, gcc-13]
         standard: [20, 23]
         mode: [dev, debug, release]
-        include:
-          - compiler: clang++-18
-            standard: 20
-            mode: dev
-          - compiler: clang++-18
-            standard: 20
-            mode: debug
-          - compiler: clang++-18
-            standard: 20
-            mode: release
-          - compiler: clang++-18
-            standard: 23
-            mode: dev
-          - compiler: clang++-18
-            standard: 23
-            mode: debug
-          - compiler: clang++-18
-            standard: 23
-            mode: release
-          - compiler: gcc-13
-            standard: 20
-            mode: dev
-          - compiler: gcc-13
-            standard: 20
-            mode: debug
-          - compiler: gcc-13
-            standard: 20
-            mode: release
-          - compiler: gcc-13
-            standard: 23
-            mode: dev
-          - compiler: gcc-13
-            standard: 23
-            mode: debug
-          - compiler: gcc-13
-            standard: 23
-            mode: release
-          - compiler: clang++-18
-            standard: 23
-            mode: release
-            options: --cook dpdk --dpdk-machine haswell
-            enables: --enable-dpdk
-          - compiler: clang++-18
-            standard: 23
-            mode: debug
-            enables: --enable-cxx-modules
     with:
       compiler: ${{ matrix.compiler }}
       standard: ${{ matrix.standard }}
       mode: ${{ matrix.mode }}
       enables: ${{ matrix.enables }}
       options: ${{ matrix.options }}
+  build_with_dpdk:
+    name: "Test with DPDK enabled (${{ matrix.compiler }}, C++${{ matrix.standard}}, ${{ matrix.mode }})"
+    uses: ./.github/workflows/test.yaml
+    strategy:
+      fail-fast: false
+    with:
+      compiler: clang++-18
+      standard: 23
+      mode: release
+      enables: --enable-dpdk
+      options: --cook dpdk --dpdk-machine haswell
+  build_with_cxx_modules:
+    name: "Test with C++20 modules enabled (${{ matrix.compiler }}, C++${{ matrix.standard}}, ${{ matrix.mode }})"
+    uses: ./.github/workflows/test.yaml
+    strategy:
+      fail-fast: false
+    with:
+      compiler: clang++-18
+      standard: 23
+      mode: debug
+      enables: --enable-cxx-modules