Skip to content

Commit

Permalink
Merge d29d900 into 4904385
Browse files Browse the repository at this point in the history
  • Loading branch information
bojand committed Oct 18, 2019
2 parents 4904385 + d29d900 commit 425dbf5
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 17 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/nodejs.yml
@@ -0,0 +1,48 @@
name: Node CI

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [8.x, 10.x, 12.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: npm install, and test
run: |
npm ci
npm test
env:
CI: true
- name: Generate coverage
if: success()
run: |
mkdir coverage
npm run coverage
env:
CI: true
- name: Coveralls Parallel
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel: true
- name: Coveralls Finished
if: success()
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@
**A minimalistic [gRPC](http://www.grpc.io) microservice framework.**

[![npm version](https://img.shields.io/npm/v/mali.svg?style=flat-square)](https://www.npmjs.com/package/mali)
[![build status](https://img.shields.io/travis/malijs/mali/master.svg?style=flat-square)](https://travis-ci.org/malijs/mali)
[![build status](https://github.com/malijs/mali/workflows/.github/workflows/nodejs.yml/badge.svg)](https://github.com/malijs/mali/actions)
[![coverage status](https://img.shields.io/coveralls/github/malijs/mali.svg?style=flat-square)](https://coveralls.io/github/malijs/mali)
[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg?style=flat-square)](https://standardjs.com)
[![License](https://img.shields.io/github/license/malijs/mali.svg?style=flat-square)](https://raw.githubusercontent.com/malijs/mali/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -7,7 +7,7 @@
"lint": "standard | snazzy",
"linttest": "npm run lint && ava -v",
"test": "nyc npm run linttest",
"coverage": "nyc report --reporter=text-lcov | coveralls",
"coverage": "nyc report --reporter=text-lcov > ./coverage/lcov.info",
"apidocs": "jsdoc2md lib/*.js > api2.md",
"docs": "jsdoc2md lib/*.js --heading-depth 3 | ./fixdocs > api.md"
},
Expand Down
2 changes: 1 addition & 1 deletion test/app.test.js
Expand Up @@ -45,7 +45,7 @@ test('app.inspect should return app properties', t => {
t.truthy(app)
const str = util.inspect(app)
process.env.NODE_ENV = NODE_ENV
t.is('{ ports: [],\n context: Context {},\n env: \'development\',\n name: \'Greeter\',\n foo: \'bar\' }', str)
t.is('{ ports: [],\n context: Context {},\n env: \'development\',\n name: \'Greeter\',\n foo: \'bar\' }'.replace(/\s/g, ''), str.replace(/\s/g, ''))
})

test.cb('app.start() with a default port from OS when no params given', t => {
Expand Down
2 changes: 1 addition & 1 deletion test/util.js
@@ -1,7 +1,7 @@
const _ = require('lodash')

function getPort () {
return _.random(1000, 60000)
return _.random(1000, 65000)
}

function getHostport (port) {
Expand Down

0 comments on commit 425dbf5

Please sign in to comment.