X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=06fee6c33ec5e47dd026db44b2b640165dfea7ea;hb=ba0564367ed4a5677bc4c45ab0d1cbed708ebef5;hp=9d62b62f3606f66f88a9a5201f8c4b8570156e1b;hpb=46df94cf75de62d4615f34afd07be17422f2b3bd;p=e-mobility-charging-stations-simulator.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d62b62f..06fee6c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,42 +1,44 @@
 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', '20.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 }}
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Setup node ${{ matrix.node }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - name: npm install
-        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 --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'"
-        run: npm run coverage
+          cache: 'pnpm'
+      - name: pnpm install
+        run: pnpm install
+      - name: pnpm lint
+        run: pnpm lint
+      - name: pnpm build
+        run: pnpm build
+      - name: pnpm test
+        run: pnpm test
+      - name: pnpm coverage
+        if: ${{ github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x' }}
+        run: pnpm coverage
       - name: SonarCloud Scan
-        if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
-        uses: sonarsource/sonarcloud-github-action@master
+        if: ${{ github.repository == 'sap/e-mobility-charging-stations-simulator' && 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 }}
@@ -44,42 +46,47 @@ 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', '20.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 }}
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Setup node ${{ matrix.node }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - name: npm install
-        run: npm ci
-      - name: npm run lint
-        run: npm run lint
-        continue-on-error: true
-      - name: 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'"
-      #   run: npm run coverage
-      # - name: SonarCloud Scan
-      #   if: "github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '16.x'"
-      #   uses: sonarsource/sonarcloud-github-action@master
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          cache: 'pnpm'
+      - name: pnpm install
+        run: pnpm install
+      - name: pnpm lint
+        run: pnpm lint
+      - name: pnpm build
+        run: pnpm build
+      - name: pnpm test
+        run: pnpm test
+      - name: pnpm coverage
+        if: ${{ github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x' }}
+        run: pnpm coverage
+      - name: SonarCloud Scan
+        if: ${{ github.repository == 'sap/e-mobility-charging-stations-simulator' && matrix.os == 'ubuntu-latest' && matrix.node == '18.x' }}
+        uses: sonarsource/sonarcloud-github-action@v1.9.1
+        with:
+          projectBaseDir: ui/web
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
   build-docker:
     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