X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=3e42ed4d1847019e44ab10d3a76a013b31e6f9f3;hb=5fd821567f58e87a93d1ddf4104b6b98fb39da18;hp=8cd177af39cfdaf64fc19bd9845e079629a13674;hpb=daa307e54545706359aff24ef409a73eac4a4c11;p=poolifier.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8cd177af..3e42ed4d 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:
@@ -14,12 +15,12 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.node }}
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        node: ['14.x', '16.x', '18.x']
+        node: ['16.x', '18.x', '19.x']
 
     steps:
       - name: Checkout
@@ -27,31 +28,31 @@ 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 }}
 
       - name: Install
-        run: npm ci
+        run: |
+          corepack enable
+          pnpm install
 
       - name: Build
-        run: npm run build --if-present
+        run: pnpm run build --if-present
 
       - name: Lint
-        run: npm run lint
+        run: pnpm run lint
 
       - name: Tests
-        run: npm run test
+        run: pnpm 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
+      - name: Coverage Report
+        if: "github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x'"
+        run: pnpm 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
@@ -59,4 +60,4 @@ jobs:
 
       - name: Benchmark
         if: github.event.inputs.withBenchmark
-        run: npm run benchmark
+        run: pnpm run benchmark