X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=3f5aef75e122d9d7abde26ee55f2c6cc45e53bc1;hb=9ea6607899cf857330c4944b54db2af141e4cfe8;hp=9f12fe0c4266b82cbc81438bea01ea7aab147d28;hpb=84afaf178ffb604d69550e63bf72bef1ec40c95f;p=poolifier.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f12fe0c..3f5aef75 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,10 +2,11 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
     types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [master]
   workflow_dispatch:
     inputs:
       withBenchmark:
@@ -19,7 +20,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        node: ['16.x', '18.x']
+        node: ['16.x', '18.x', '19.7.x']
 
     steps:
       - name: Checkout
@@ -27,7 +28,7 @@ jobs:
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis. This is needed for better sonar
 
-      - name: Set node version to ${{ matrix.node }}
+      - name: Setup node ${{ matrix.node }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
@@ -44,15 +45,12 @@ jobs:
       - name: Tests
         run: npm run test
 
-      - name: Coverage & Linter Reports
-        if: "github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
-        run: |
-          npm run coverage
-          npm run lint:report
-          sed -i 's+/home/runner/work/*+/github/workspace+g' reports/eslint.json
+      - name: Coverage Report
+        if: "github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x'"
+        run: npm run coverage
 
       - name: Sonar Code Analysis
-        if: "github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
+        if: "github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x'"
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any