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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 536fdf4f..06fee6c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,35 +4,41 @@ 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', '20.x']
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+      - 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
-      - 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
+          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,29 +50,35 @@ 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:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+      - 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
-      - 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
+          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
+        with:
+          projectBaseDir: ui/web
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}