X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=48887ca7c14a2f280023ab15f19df9453e512f2f;hb=62340a29089d0753f45b57dc3e5b8d4871c7d736;hp=d38f3cc5e7cd513c4333f3beb55c66cb5c25d938;hpb=f6a807ed6b62298b99d592021b2caa96274e391f;p=e-mobility-charging-stations-simulator.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d38f3cc5..48887ca7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,22 +1,23 @@
 name: CI
 on:
   push:
-    branches:
-      - main
+    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']
+        node: ['16.x', '18.x', '19.x']
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Use Node.js ${{ matrix.node }}
+      - name: Setup node ${{ matrix.node }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
@@ -24,18 +25,15 @@ jobs:
         run: npm ci
       - name: npm run lint
         run: npm run lint
-        continue-on-error: true
       - name: npm run build
-        if: "matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'"
-        run: npm run build
+        run: npm run build --if-present
       - name: npm test
-        if: "matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'"
         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,16 +42,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     defaults:
       run:
-        working-directory: src/ui/web
+        working-directory: ui/web
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        node: ['16.x', '18.x']
+        node: ['16.x', '18.x', '19.x']
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Use Node.js ${{ matrix.node }}
+      - name: Setup node ${{ matrix.node }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
@@ -61,17 +59,18 @@ jobs:
         run: npm ci
       - name: npm run lint
         run: npm run lint
-        continue-on-error: true
       - name: npm run build
-        run: npm run build
+        run: npm run build --if-present
       - 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 }}
@@ -79,7 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Docker Buildx
+      - name: Setup Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
       - name: Build docker image