From 299e4a497f66663a3e501ce45ffab7b776c6e29d Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Sun, 20 Dec 2020 19:58:06 +0100
Subject: [PATCH 1/5] Create node.js.yml

---
 .github/workflows/node.js.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/node.js.yml

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
new file mode 100644
index 00000000..f462f309
--- /dev/null
+++ b/.github/workflows/node.js.yml
@@ -0,0 +1,31 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: MagicMirror Automated Testing
+
+on:
+  push:
+    branches: [ master, develop, ci-test ]
+  pull_request:
+    branches: [ master, develop, ci-test ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm run test:prettier
+    - run: npm run test:js
+    - run: npm run test:css
+    - run: npm run test:e2e
+    - run: npm run test:unit

From 54ac450f928353d9655963ab4062edfe542404b8 Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Sun, 20 Dec 2020 20:00:54 +0100
Subject: [PATCH 2/5] Update and rename node.js.yml to node-ci.js.yml

---
 .github/workflows/{node.js.yml => node-ci.js.yml} | 1 +
 1 file changed, 1 insertion(+)
 rename .github/workflows/{node.js.yml => node-ci.js.yml} (97%)

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node-ci.js.yml
similarity index 97%
rename from .github/workflows/node.js.yml
rename to .github/workflows/node-ci.js.yml
index f462f309..3fdae25e 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node-ci.js.yml
@@ -24,6 +24,7 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - run: npm install
     - run: npm run test:prettier
     - run: npm run test:js
     - run: npm run test:css

From 8251792a0d771c0c4b0aa08338026a96df376c5b Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Sun, 20 Dec 2020 20:04:06 +0100
Subject: [PATCH 3/5] Update .prettierignore

---
 .prettierignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.prettierignore b/.prettierignore
index 3b87fcd2..b829fa7c 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,3 +2,4 @@ package-lock.json
 /config/**/*
 /vendor/**/*
 !/vendor/vendor.js
+.github/**/*

From 39d7ceb0175e68ebaf2a84fbfaa5b69c1dd79834 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Sun, 20 Dec 2020 22:03:20 +0100
Subject: [PATCH 4/5] test github actions

---
 .github/workflows/node-ci.js.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/node-ci.js.yml b/.github/workflows/node-ci.js.yml
index 3fdae25e..5f916bcf 100644
--- a/.github/workflows/node-ci.js.yml
+++ b/.github/workflows/node-ci.js.yml
@@ -24,9 +24,12 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm install
-    - run: npm run test:prettier
-    - run: npm run test:js
-    - run: npm run test:css
-    - run: npm run test:e2e
-    - run: npm run test:unit
+    - run: |
+        Xvfb :99 -screen 0 1024x768x16 &
+        export DISPLAY=:99
+        npm install
+        npm run test:prettier
+        npm run test:js
+        npm run test:css
+        npm run test:e2e
+        npm run test:unit

From 911687af2a3a6cf992e3afcb8235656461e4c94a Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Mon, 21 Dec 2020 09:28:26 +0100
Subject: [PATCH 5/5] Remove Travis

---
 .travis.yml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b2c4ae0f..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-dist: trusty
-language: node_js
-node_js:
-  - 10
-  - lts/*
-  - node
-before_install:
-  - npm i -g npm
-before_script:
-  - yarn danger ci
-  - "export DISPLAY=:99.0"
-  - "export ELECTRON_DISABLE_SANDBOX=1"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 5
-script:
-  - npm run test:prettier
-  - npm run test:js
-  - npm run test:css
-  - npm run test:e2e
-  - npm run test:unit
-after_script:
-  - npm list
-cache:
-  directories:
-    - node_modules