From a8dce544780aaa6b90e2d4cb6af6632e4de6fba1 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Sun, 16 Jul 2023 02:16:03 -0400
Subject: [PATCH 1/2] Refactored CIs to use a matrix for cryptographic backend
 featuer flags.

---
 .github/workflows/test-linux-mbedtls.yml      | 22 -------------------
 .github/workflows/test-linux-rustcrypto.yml   | 22 -------------------
 ...{test-linux-openssl.yml => test-linux.yml} |  7 ++++--
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/test-linux-mbedtls.yml
 delete mode 100644 .github/workflows/test-linux-rustcrypto.yml
 rename .github/workflows/{test-linux-openssl.yml => test-linux.yml} (65%)

diff --git a/.github/workflows/test-linux-mbedtls.yml b/.github/workflows/test-linux-mbedtls.yml
deleted file mode 100644
index 6971853d..00000000
--- a/.github/workflows/test-linux-mbedtls.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Test-Linux-mbedTLS
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build_and_test:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: cd matter; cargo build --verbose --no-default-features --features crypto_mbedtls
-    - name: Run tests
-      run: cd matter; cargo test --verbose --no-default-features --features crypto_mbedtls -- --test-threads=1
diff --git a/.github/workflows/test-linux-rustcrypto.yml b/.github/workflows/test-linux-rustcrypto.yml
deleted file mode 100644
index 082fcb8d..00000000
--- a/.github/workflows/test-linux-rustcrypto.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Test-Linux-RustCrypto
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build_and_test:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: cd matter; cargo build --verbose --no-default-features --features crypto_rustcrypto
-    - name: Run tests
-      run: cd matter; cargo test --verbose --no-default-features --features crypto_rustcrypto -- --test-threads=1
diff --git a/.github/workflows/test-linux-openssl.yml b/.github/workflows/test-linux.yml
similarity index 65%
rename from .github/workflows/test-linux-openssl.yml
rename to .github/workflows/test-linux.yml
index 7efc6396..a41d8b3a 100644
--- a/.github/workflows/test-linux-openssl.yml
+++ b/.github/workflows/test-linux.yml
@@ -13,10 +13,13 @@ jobs:
   build_and_test:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        crypto-backend: ['crypto_openssl', 'crypto_rustcrypto', 'crypto_mbedtls']
 
     steps:
     - uses: actions/checkout@v2
     - name: Build
-      run: cd matter; cargo build --verbose --no-default-features --features crypto_openssl
+      run: cd matter; cargo build --verbose --no-default-features --features ${{matrix.crypto-backend}}
     - name: Run tests
-      run: cd matter; cargo test --verbose --no-default-features --features crypto_openssl -- --test-threads=1
+      run: cd matter; cargo test --verbose --no-default-features --features ${{matrix.crypto-backend}} -- --test-threads=1

From 15497a611abcaca7910e9eda20745f95a2404672 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Sun, 16 Jul 2023 02:22:14 -0400
Subject: [PATCH 2/2] Renamed Test-Linux-OpenSSL to Test-Linux

---
 .github/workflows/test-linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index a41d8b3a..82e24255 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -1,4 +1,4 @@
-name: Test-Linux-OpenSSL
+name: Test-Linux
 
 on:
   push: