feat(simulator): wait for transactions end before simulating firmware

[e-mobility-charging-stations-simulator.git] / .github / workflows / ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae0678b95724175004942f322f00646ec85045ac..48887ca7c14a2f280023ab15f19df9453e512f2f 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,8 @@ on:
     branches: [main]
   pull_request:
     types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [main]
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -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
@@ -62,16 +64,16 @@ 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'"
-        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 }}
+      # - 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@master
+      #   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: