Use default CI matrix

pluginsGLPI · Feb 20, 2024 · 0325428 · 0325428
1 parent d07f247
commit 0325428
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -3,24 +3,30 @@ name: "Continuous integration"
 on:
   push:
     branches:
-      - "master"
+      - "main"
     tags:
        - "*"
   pull_request:
   schedule:
     - 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"