From ceeee3de3488f4cad0469768f70132dbb7105da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <canne@teclib.com>
Date: Mon, 12 Feb 2024 12:05:52 +0100
Subject: [PATCH] Use default CI matrix

---
 .github/workflows/continuous-integration.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index f8093d9..ffc57a7 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -11,18 +11,22 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
 jobs:
+  generate-ci-matrix:
+    name: "Generate CI matrix"
+    uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
+    with:
+      glpi-version: "10.0.x"
   ci:
     name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
+    needs: "generate-ci-matrix"
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - {glpi-version: "10.0.x", php-version: "7.4", db-image: "mysql:5.7"}
-          - {glpi-version: "10.0.x", php-version: "8.0", db-image: "mysql:8.0"}
-          - {glpi-version: "10.0.x", php-version: "8.1", db-image: "mariadb:10.2"}
-          - {glpi-version: "10.0.x", php-version: "8.2", db-image: "mariadb:11.0"}
-          - {glpi-version: "10.0.x", php-version: "8.3-rc", db-image: "mysql:8.0"}
+      matrix: ${{ fromJson(needs.generate-ci-matrix.outputs.matrix) }}
     uses: "glpi-project/plugin-ci-workflows/.github/workflows/continuous-integration.yml@v1"
     with:
       plugin-key: "databaseinventory"