From dd737c3f5814f461de82c9d12931eb860d58d036 Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Tue, 29 Dec 2020 20:17:29 +0100
Subject: [PATCH] ci: add exit flag for mocha e2e env

---
 .github/workflows/ci.yaml | 15 +--------------
 package.json              |  4 ++--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e3ab92872..192e0a7e9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,19 +3,6 @@ name: Build and release
 on: [push]
 
 jobs:
-  test:
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Run headless test
-        uses: GabrielBB/xvfb-action@v1
-        with:
-          working-directory: ./ #optional
-          run: npm run e2e
   build:
     runs-on: ubuntu-latest
 
@@ -28,7 +15,7 @@ jobs:
       - run: npm install
       - run: npm test
       - run: sudo apt-get install xvfb
-      #- run: xvfb-run --auto-servernum npm run e2e
+      - run: xvfb-run --auto-servernum npm run e2e
       - run: npm run build:prod
         env:
           CI: true
diff --git a/package.json b/package.json
index c554bb43e..80cafc0d1 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "electron:build": "npm run build:prod && electron-builder build",
     "test": "jest",
     "test:watch": "jest --watch",
-    "e2e": "npm run build:prod && cross-env TS_NODE_PROJECT='e2e/tsconfig.e2e.json' mocha e2e/**/*.ts --config ./.mocharc.json",
+    "e2e": "npm run build:prod && cross-env TS_NODE_PROJECT='e2e/tsconfig.e2e.json' mocha e2e/**/*.ts --config ./.mocharc.json --exit",
     "e2e:watch": "npm run e2e -- --watch",
     "version": "conventional-changelog -i CHANGELOG.md -p angular -s -r 0 && git add CHANGELOG.md",
     "lint": "ng lint"
@@ -144,4 +144,4 @@
       "lcov"
     ]
   }
-}
+}
\ No newline at end of file