From 032542874c6442062aa0ecb985b2c08858335b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
Date: Tue, 20 Feb 2024 09:42:23 +0100
Subject: [PATCH] Use default CI matrix

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

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index b4c8afc..f21cdb7 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -3,7 +3,7 @@ name: "Continuous integration"
 on:
   push:
     branches:
-      - "master"
+      - "main"
     tags:
        - "*"
   pull_request:
@@ -11,16 +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.1.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.1.x", php-version: "8.1", db-image: "mariadb:10.5"}
-          - {glpi-version: "10.1.x", php-version: "8.2", db-image: "mariadb:11.0"}
-          - {glpi-version: "10.1.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: "deploy"