Skip to content

Commit cac8ddf

Browse files
committed
Merge branch 'master' into muxable-master
2 parents 5e6139e + fef3678 commit cac8ddf

File tree

7 files changed

+28
-14
lines changed

7 files changed

+28
-14
lines changed

.github/workflows/node.js.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,38 @@ name: Node.js CI
66
on: ["push", "pull_request"]
77

88
jobs:
9-
build:
9+
test:
1010

11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-18.04
1212

1313
strategy:
1414
matrix:
15-
node-version: [16.x]
15+
node-version: [12.x, 13.x, 14.x, 15.x, 16.x]
1616

1717
steps:
1818
- uses: actions/checkout@v2
19-
# - run: sudo apt install gfortran
20-
# - run: cd reference && make && cd ..
19+
- run: sudo apt install gfortran
20+
- run: cd reference && make && cd ..
2121
- name: Use Node.js ${{ matrix.node-version }}
2222
uses: actions/setup-node@v1
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525
- run: npm ci
26-
- run: npm run build --if-present
26+
- run: npm run build
2727
- run: npm test
28+
- name: Coveralls
29+
uses: coverallsapp/github-action@master
30+
with:
31+
github-token: ${{ secrets.GITHUB_TOKEN }}
32+
flag-name: run-${{ matrix.test_number }}
33+
parallel: true
34+
35+
finish:
36+
needs: test
37+
runs-on: ubuntu-18.04
38+
steps:
39+
- name: Coveralls Finished
40+
uses: coverallsapp/github-action@master
41+
with:
42+
github-token: ${{ secrets.github_token }}
43+
parallel-finished: true

.github/workflows/npm-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-18.04
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-node@v1
@@ -23,7 +23,7 @@ jobs:
2323

2424
publish-npm:
2525
needs: build
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-18.04
2727
steps:
2828
- uses: actions/checkout@v2
2929
- uses: actions/setup-node@v1

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
publish:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-18.04
1111
steps:
1212
-
1313
name: Checkout

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
/public
88
/.cache
99
/.parcel-cache
10+
/coverage

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# egm96-universal
22

3-
[![Node.js CI](https://github.com/nicolas-van/egm96-universal/workflows/Node.js%20CI/badge.svg)](https://github.com/nicolas-van/egm96-universal/actions?query=workflow%3A%22Node.js+CI%22) [![npm](https://img.shields.io/npm/v/egm96-universal)](https://www.npmjs.com/package/egm96-universal)
3+
[![Node.js CI](https://github.com/nicolas-van/egm96-universal/workflows/Node.js%20CI/badge.svg)](https://github.com/nicolas-van/egm96-universal/actions?query=workflow%3A%22Node.js+CI%22) [![npm](https://img.shields.io/npm/v/egm96-universal)](https://www.npmjs.com/package/egm96-universal) [![Coverage Status](https://coveralls.io/repos/github/nicolas-van/egm96-universal/badge.svg?branch=master)](https://coveralls.io/github/nicolas-van/egm96-universal?branch=master)
44

55
A library to convert between EGM96-relative altitudes and WGS84 ellipsoid-relative altitudes.
66

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"convert-data": "node ./convertDataFile.js",
1919
"test": "npm run prebuild && npm run lint && npm run jest",
2020
"lint": "npm run prebuild && eslint \"*.js\" \"src/**/*.js\"",
21-
"jest": "npm run prebuild && jest",
21+
"jest": "npm run prebuild && jest --config=./jest.config.js --coverage",
2222
"build": "npm run rollup",
2323
"rollup": "rollup -c",
2424
"website-build": "npm run prebuild && parcel build demo/index.html --dist-dir public --public-url ./",

src/egm96.reference.test.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21

32
import * as egm96 from './egm96'
43
import * as cp from 'child_process'
@@ -94,7 +93,6 @@ test('empty test', () => {
9493
expect(true).toBe(true)
9594
})
9695

97-
/*
9896
test('intersection test', () => {
9997
const coords = []
10098
for (let a = -85; a <= 85; a += 20) {
@@ -114,7 +112,6 @@ test('non intersection test', () => {
114112
testComparison(lat, lon, false)
115113
}
116114
})
117-
*/
118115

119116
// 100 randomly generated coordinates
120117
const samples = [

0 commit comments

Comments
 (0)