chore(gritty) lint

cloudcmd · Mar 16, 2021 · 05e51ab · 05e51ab
1 parent c4778c6
commit 05e51ab
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 47 deletions.
diff --git a/.github/main.workflow b/.github/main.workflow
@@ -0,0 +1,12 @@
+workflow "Push" {
+  resolves = ["lint", "coverage"]
+  on = "push"
+}
+
+action "lint" {
+  uses = "gimenete/eslint-action@1.0"
+}
+
+action "coverage" {
+  uses = "coverallsapp/github-action@v1.0.1"
+}
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -0,0 +1,45 @@
+name: Node CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x, 15.x]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Install Redrun
+      run:
+        npm i redrun -g
+
+    - name: Install
+      run:
+        npm install
+
+    - name: Bootstrap
+      run:
+        redrun bootstrap
+
+    - name: Lint
+      run:
+        redrun lint
+
+    - name: Coverage
+      run:
+        redrun coverage report
+
+    - name: Coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.madrun.mjs b/.madrun.mjs
@@ -1,4 +1,4 @@
-import {run} from 'madrun';
+import {run, cutEnv} from 'madrun';
 
 const SUPERTAPE_TIMEOUT = 10_000;
 
@@ -25,7 +25,7 @@ export default {
     'watch:lint': async () => `nodemon -w client -w server -w webpack.config.js -x ${await run('lint')}`,
     'report': () => 'c8 report --reporter=lcov',
 
-    'coverage': () => ['nyc npm test', {
+    'coverage': async () => [`c8 ${await cutEnv('test')}`, {
         SUPERTAPE_TIMEOUT,
     }],
 

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,5 +1,18 @@
 # Gritty [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Coverage Status][CoverageIMGURL]][CoverageURL]
 
+[NPMIMGURL]: https://img.shields.io/npm/v/gritty.svg?style=flat&longCache=true
+[BuildStatusURL]: https://github.com/cloudcmd/gritty/actions?query=workflow%3A%22Node+CI%22 "Build Status"
+[BuildStatusIMGURL]: https://github.com/cloudcmd/gritty/workflows/Node%20CI/badge.svg
+[DependencyStatusURL]: https://david-dm.org/cloudcmd/gritty "Dependency Status"
+[DependencyStatusIMGURL]: https://img.shields.io/david/cloudcmd/gritty.svg?style=flat&longCache=true
+[LicenseIMGURL]: https://img.shields.io/badge/license-MIT-317BF9.svg?style=flat&longCache=true
+[NPM_INFO_IMG]: https://nodei.co/npm/cloudcmd.png
+[NPMURL]: https://npmjs.org/package/cloudcmd "npm"
+[BuildStatusURL]: https://travis-ci.org/cloudcmd/gritty "Build Status"
+[LicenseURL]: https://tldrlegal.com/license/mit-license "MIT License"
+[CoverageURL]: https://coveralls.io/github/cloudcmd/gritty?branch=master
+[CoverageIMGURL]: https://coveralls.io/repos/cloudcmd/gritty/badge.svg?branch=master&service=github
+
 Web terminal emulator. Based on [node-pty](https://github.com/Tyriar/node-pty) and [xterm.js](https://github.com/sourcelair/xterm.js).
 
 ![Gritty](https://raw.githubusercontent.com/cloudcmd/gritty/master/img/linux.png "Gritty on Linux")
@@ -149,24 +162,3 @@ server.listen(port, ip);
 
 MIT
 
-[NPMIMGURL]: https://img.shields.io/npm/v/gritty.svg?style=flat&longCache=true
-
-[BuildStatusIMGURL]: https://img.shields.io/travis/cloudcmd/gritty/master.svg?style=flat&longCache=true
-
-[DependencyStatusIMGURL]: https://img.shields.io/david/cloudcmd/gritty.svg?style=flat&longCache=true
-
-[LicenseIMGURL]: https://img.shields.io/badge/license-MIT-317BF9.svg?style=flat&longCache=true
-
-[NPM_INFO_IMG]: https://nodei.co/npm/cloudcmd.png
-
-[NPMURL]: https://npmjs.org/package/cloudcmd "npm"
-
-[BuildStatusURL]: https://travis-ci.org/cloudcmd/gritty "Build Status"
-
-[DependencyStatusURL]: https://david-dm.org/cloudcmd/gritty "Dependency Status"
-
-[LicenseURL]: https://tldrlegal.com/license/mit-license "MIT License"
-
-[CoverageURL]: https://coveralls.io/github/cloudcmd/gritty?branch=master
-
-[CoverageIMGURL]: https://coveralls.io/repos/cloudcmd/gritty/badge.svg?branch=master&service=github
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
     "@cloudcmd/stub": "^3.0.0",
     "@iocmd/wait": "^1.0.0",
     "babel-loader": "^8.0.0",
+    "c8": "^7.6.0",
     "clean-css-loader": "^3.0.0",
     "coveralls": "^3.0.0",
     "css-loader": "^5.0.0",
@@ -70,7 +71,6 @@
     "madrun": "^8.6.0",
     "mock-require": "^3.0.2",
     "nodemon": "^2.0.1",
-    "nyc": "^15.0.0",
     "optimize-css-assets-webpack-plugin": "^5.0.0",
     "putout": "^15.7.2",
     "request": "^2.81.0",