Skip to content

Commit 750f13d

Browse files
committed
Merge branch 'master' into hardening/remove-unneeded-file
2 parents 9faca43 + e9a211f commit 750f13d

File tree

6 files changed

+96
-34
lines changed

6 files changed

+96
-34
lines changed

.github/workflows/ci.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: CI
2+
'on':
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
jobs:
10+
lint-markdown:
11+
name: Lint Markdown
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Git checkout
15+
uses: actions/checkout@v2
16+
- name: Use Node.js 12.x
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: 12.x
20+
- name: Run Remark Markdown Linter
21+
run: |
22+
npm install
23+
npm run lint:md
24+
- name: Run Textlint Markdown Linter
25+
run: npm run lint:text
26+
27+
lint-code:
28+
name: Lint JavaScript
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Git checkout
32+
uses: actions/checkout@v2
33+
- name: Use Node.js 12.x
34+
uses: actions/setup-node@v1
35+
with:
36+
node-version: 12.x
37+
- name: Run EsLint Node.js Linter
38+
run: |
39+
npm install
40+
npm run lint
41+
42+
unit-test:
43+
name: Unit Tests
44+
runs-on: ubuntu-latest
45+
services:
46+
mongodb:
47+
image: mongo:3.6
48+
ports:
49+
- 27017:27017
50+
strategy:
51+
matrix:
52+
node-version:
53+
- 10.x
54+
- 12.x
55+
steps:
56+
- name: Git checkout
57+
uses: actions/checkout@v2
58+
- name: 'Install Node.js ${{ matrix.node-version }}'
59+
uses: actions/setup-node@v1
60+
with:
61+
node-version: '${{ matrix.node-version }}'
62+
- name: 'Unit Tests with Node.js ${{ matrix.node-version }}'
63+
run: |
64+
npm install
65+
npm test
66+
67+
code-coverage:
68+
name: Coveralls Code Coverage
69+
runs-on: ubuntu-latest
70+
needs: unit-test
71+
services:
72+
mongodb:
73+
image: mongo:3.6
74+
ports:
75+
- 27017:27017
76+
steps:
77+
- name: Git checkout
78+
uses: actions/checkout@v2
79+
- name: 'Test Coverage with Node.js 12.x'
80+
uses: actions/setup-node@v1
81+
with:
82+
node-version: 12.x
83+
- run: |
84+
npm install
85+
npm run test:coverage
86+
- name: Push to Coveralls
87+
uses: coverallsapp/github-action@master
88+
with:
89+
github-token: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
[![FIWARE IoT Agents](https://nexus.lab.fiware.org/static/badges/chapters/iot-agents.svg)](https://www.fiware.org/developers/catalogue/)
44
[![License: APGL](https://img.shields.io/github/license/telefonicaid/iotagent-node-lib.svg)](https://opensource.org/licenses/AGPL-3.0)
5-
[![Support badge](https://nexus.lab.fiware.org/repository/raw/public/badges/stackoverflow/iot-agents.svg)](https://stackoverflow.com/questions/tagged/fiware+iot)
5+
[![Support badge](https://img.shields.io/badge/tag-fiware+iot-orange.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/fiware+iot)
66
<br/>
77
[![Documentation badge](https://img.shields.io/readthedocs/iotagent-node-lib.svg)](http://iotagent-node-lib.readthedocs.org/en/latest/?badge=latest)
8-
[![Build badge](https://img.shields.io/travis/telefonicaid/iotagent-node-lib.svg)](https://travis-ci.org/telefonicaid/iotagent-node-lib/)
8+
[![CI](https://github.com/telefonicaid/iotagent-node-lib/workflows/CI/badge.svg)](https://github.com/telefonicaid/iotagent-node-lib/actions?query=workflow%3ACI)
99
[![Coverage Status](https://coveralls.io/repos/github/telefonicaid/iotagent-node-lib/badge.svg?branch=master)](https://coveralls.io/github/telefonicaid/iotagent-node-lib?branch=master)
1010
![Status](https://nexus.lab.fiware.org/static/badges/statuses/iot-node-lib.svg)
1111

@@ -363,7 +363,7 @@ related with the fact that different people assign different interpretations on
363363
used in these licenses. Due to this, some people believe that there is a risk in just _using_ software under GPL or AGPL
364364
licenses (even without _modifying_ it).
365365

366-
For the avoidance of doubt, the owners of this software licensed under an AGPL-3.0 license
366+
For the avoidance of doubt, the owners of this software licensed under an AGPL-3.0 license
367367
wish to make a clarifying public statement as follows:
368368

369369
> Please note that software derived as a result of modifying the source code of this software in order to fix a bug or

doc/api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The IoT Agents provide two means to define those service groups:
3030

3131
- Static **Type Configuration**: configuring the `ngsi.types` attribute within the `config.js` file.
3232
- Dynamic **Configuration API**: making use of the API URLs in the configuration URI, `/iot/services`. Please, note
33-
that the configuration API manage servers under an URL that requires the `server.name` parameter to be set (the name
33+
that the configuration API manage servers under a URL that requires the `server.name` parameter to be set (the name
3434
of the IoT Agent we are using). If no name is configured `default` is taken as the default one.
3535

3636
Both approaches provide the same configuration information for the types and end up in the same configuration

doc/development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ npm run clean
8888

8989
### Documentation Markdown validation
9090

91-
Checks the markdown documentation for consistency
91+
Checks the Markdown documentation for consistency
9292

9393
```bash
9494
# Use git-bash on Windows
@@ -97,7 +97,7 @@ npm run lint:md
9797

9898
### Documentation Spell-checking
9999

100-
Uses the provided `.textlintrc` flag file. To check the markdown documentation for spelling and grammar errors, dead
100+
Uses the provided `.textlintrc` flag file. To check the Markdown documentation for spelling and grammar errors, dead
101101
links & etc.
102102

103103
```bash

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
"should": "13.2.3",
7878
"sinon": "~9.0.2",
7979
"textlint": "~11.7.6",
80+
"textlint-filter-rule-comments": "~1.2.2",
8081
"textlint-rule-common-misspellings": "~1.0.1",
8182
"textlint-rule-no-dead-link": "~4.7.0",
8283
"textlint-rule-terminology": "~2.1.4",

0 commit comments

Comments
 (0)