X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=1ebf798a946325a446cf92528d8e73de36237210;hb=bb1e5fcb684566b96a8c2547e99565ab009cfc89;hp=5c2f0f157d9705f4e26837a65bbbc659825aefa1;hpb=ebbfbf1c01e010d051956867484b74a94237f546;p=e-mobility-charging-stations-simulator.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c2f0f15..1ebf798a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,13 +4,15 @@ on:
     branches: [main]
   pull_request:
     types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [main]
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        node: ['16.x', '18.x', '19.x']
+        node: ['16.x', '18.x', '19.7,x']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -28,10 +30,10 @@ jobs:
       - name: npm test
         run: npm test
       - name: npm run coverage
-        if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
+        if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x'"
         run: npm run coverage
       - name: SonarCloud Scan
-        if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
+        if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && 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
@@ -44,7 +46,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        node: ['16.x', '18.x', '19.x']
+        node: ['16.x', '18.x', '19.7.x']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -62,11 +64,13 @@ jobs:
       - name: npm test
         run: npm test
       # - name: npm run coverage
-      #   if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
+      #   if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x'"
       #   run: npm run coverage
       # - name: SonarCloud Scan
-      #   if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
+      #   if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x'"
       #   uses: sonarsource/sonarcloud-github-action@master
+      #   with:
+      #     projectBaseDir: ui/web
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
       #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}