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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8fd19206..3f5aef75 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,11 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
+    types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [master]
   workflow_dispatch:
     inputs:
       withBenchmark:
@@ -13,22 +15,23 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        os: [windows-latest, macos-latest, ubuntu-latest]
+        node: ['16.x', '18.x', '19.7.x']
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         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-version }}
-        uses: actions/setup-node@v2
+      - name: Setup node ${{ matrix.node }}
+        uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node }}
 
       - name: Install
         run: npm ci
@@ -39,19 +42,18 @@ jobs:
       - name: Lint
         run: npm run lint
 
-      - name: Tests & Coverage
-        run: |
-          npm run test
-          npm run coverage
-        env:
-          CI: true
+      - name: Tests
+        run: npm run test
+
+      - 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 == 'pioardi/poolifier' && matrix.node-version == '14.x'"
-        run: |
-          npm run sonar
+        if: "github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x'"
+        uses: sonarsource/sonarcloud-github-action@master
         env:
-          GITHUB_TOKEN: ${{ secrets.USER_TOKEN }} # Needed to get PR information, if any
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
       - name: Benchmark