X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=e0ec4013ef16e476beafe92e4be7e61a241797f2;hb=13a332e67a8a208b09c673d8a4a132df657ff4e6;hp=075e84949687a77e824870ece8c7c73ad79a1061;hpb=5082a5a8cd4f0533a3bb75db5009ea36adb08a41;p=poolifier.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 075e8494..e0ec4013 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', '20.x']
 
     steps:
       - name: Checkout
@@ -27,36 +28,40 @@ 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 pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
+      - name: Setup node ${{ matrix.node }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'pnpm'
 
       - name: Install
-        run: npm ci
+        run: pnpm install
 
       - name: Build
-        run: npm run build --if-present
+        run: pnpm build
 
       - name: Lint
-        run: npm run lint
-
-      - name: Tests & Coverage
-        if: matrix.node == '16.x'
-        run: |
-          npm run test
-          npm run coverage
-          npm run lint:report
-        env:
-          CI: true
+        run: pnpm lint
+
+      - name: Tests
+        run: pnpm test
+
+      - name: Coverage Report
+        if: ${{ github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x' }}
+        run: pnpm coverage
 
       - name: Sonar Code Analysis
-        if: "github.repository == 'poolifier/poolifier' && matrix.node == '16.x'"
-        uses: sonarsource/sonarcloud-github-action@master
+        if: ${{ github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x' }}
+        uses: sonarsource/sonarcloud-github-action@v1.9.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
       - name: Benchmark
         if: github.event.inputs.withBenchmark
-        run: npm run benchmark
+        run: pnpm benchmark