Merge branch 'master' of github.com:poolifier/poolifier

[poolifier.git] / .github / workflows / ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 80e716564d76e050e788de5454bbdf4c4dce6929..ac9250510d785378b280816e95d4dc1f5b46c506 100644 (file)
--- 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:
@@ -32,23 +34,26 @@ jobs:
           node-version: ${{ matrix.node }}
 
       - name: Install
-        run: npm ci
+        run: |
+          corepack enable
+          corepack prepare pnpm@latest --activate
+          pnpm install
 
       - name: Build
-        run: npm run build --if-present
+        run: pnpm run build
 
       - name: Lint
-        run: npm run lint
+        run: pnpm run lint
 
       - name: Tests
-        run: npm run test
+        run: pnpm run 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 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
@@ -56,4 +61,4 @@ jobs:
 
       - name: Benchmark
         if: github.event.inputs.withBenchmark
-        run: npm run benchmark
+        run: pnpm run benchmark