X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=28c717ba5739baea6007d519140fc1582952f0b5;hb=b4c2a50df77a5f3110d228436ce9f3008cbd8297;hp=80e716564d76e050e788de5454bbdf4c4dce6929;hpb=8fddc4b99db0faa9e922d2c0d9d44c00a105374a;p=poolifier.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 80e71656..28c717ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,8 @@ on:
     branches: [master]
   pull_request:
     types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [master]
   workflow_dispatch:
     inputs:
       withBenchmark:
@@ -18,7 +20,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        node: ['16.x', '18.x', '19.x']
+        node: ['16.x', '18.x', '20.x']
 
     steps:
       - name: Checkout
@@ -26,34 +28,41 @@ jobs:
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis. This is needed for better sonar
 
-      - name: Setup node ${{ matrix.node }}
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
+      - name: Setup Node.js ${{ 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
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.x' }}
+        run: pnpm lint
 
       - name: Tests
-        run: npm run test
+        run: pnpm test
 
       - name: Coverage Report
-        if: "github.repository == 'poolifier/poolifier' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
-        run: npm run coverage
+        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.os == 'ubuntu-latest' && 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@v2.0.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
       - name: Benchmark
         if: github.event.inputs.withBenchmark
-        run: npm run benchmark
+        run: pnpm benchmark