Skip to content

Commit

Permalink
Merge pull request #24 from Klizzy/issue-23-github-actions
Browse files Browse the repository at this point in the history
#23 - added github actions for magic mirror test execution
  • Loading branch information
Klizzy authored Feb 13, 2023
2 parents e5acc8e + f79b539 commit 2e16f60
Show file tree
Hide file tree
Showing 12 changed files with 8,041 additions and 8,025 deletions.
28 changes: 14 additions & 14 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"rules": {
"indent": ["error", "tab"],
"quotes": ["error", "double"],
"max-len": ["error", 250],
"curly": "error",
"camelcase": ["error", {"properties": "never"}],
"no-trailing-spaces": ["error"],
"no-irregular-whitespace": ["error"]
},
"env": {
"browser": true,
"node": true,
"es6": true
}
"rules": {
"indent": ["error", "tab"],
"quotes": ["error", "double"],
"max-len": ["error", 250],
"curly": "error",
"camelcase": ["error", { "properties": "never" }],
"no-trailing-spaces": ["error"],
"no-irregular-whitespace": ["error"]
},
"env": {
"browser": true,
"node": true,
"es6": true
}
}
45 changes: 45 additions & 0 deletions .github/workflows/automated-tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: "Run MagicMirror Automated Tests"

on:
push:
branches: [master]
pull_request:
branches: [master]

permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
repository: MichMich/MagicMirror
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- name: Checkout MMM-Vrr
uses: actions/checkout@v3
with:
path: modules/MMM-Vrr
- name: Install MMR-Vrr dependencies
run: |
cd modules/MMM-Vrr && npm install
- name: Install dependencies and run tests
run: |
Xvfb :99 -screen 0 1024x768x16 &
export DISPLAY=:99
npm run install-mm:dev
touch css/custom.css
npm run test:prettier
npm run test:js
npm run test:css
npm run test
6 changes: 3 additions & 3 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "stylelint-config-standard",
"font-family-name-quotes": "double-where-recommended",
"block-no-empty": false
"extends": "stylelint-config-standard",
"font-family-name-quotes": "double-where-recommended",
"block-no-empty": false
}
66 changes: 0 additions & 66 deletions Gruntfile.js

This file was deleted.

18 changes: 9 additions & 9 deletions MMM-Vrr.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
*
*/
.mmm-vrr-table * {
padding-left: 20px;
padding-top: 5px;
padding-left: 20px;
padding-top: 5px;
}
.mmm-vrr-table tr.border-bottom th {
border-bottom: 1px solid #666;
padding-bottom: 5px;
margin-bottom: 10px;
border-bottom: 1px solid #666;
padding-bottom: 5px;
margin-bottom: 10px;
}
.mmm-vrr-table *:first-child {
padding-left: 0;
padding-left: 0;
}
.mmm-vrr-table .delay {
color: red;
color: red;
}

.MMM-Vrr img{
filter: grayscale(100%);
.MMM-Vrr img {
filter: grayscale(100%);
}
Loading

0 comments on commit 2e16f60

Please sign in to comment.