Skip to content

Commit

Permalink
Merge branch 'master' into muxable-master
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-van committed Aug 24, 2021
2 parents 5e6139e + fef3678 commit cac8ddf
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 14 deletions.
28 changes: 22 additions & 6 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,38 @@ name: Node.js CI
on: ["push", "pull_request"]

jobs:
build:
test:

runs-on: ubuntu-latest
runs-on: ubuntu-18.04

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

steps:
- uses: actions/checkout@v2
# - run: sudo apt install gfortran
# - run: cd reference && make && cd ..
- run: sudo apt install gfortran
- run: cd reference && make && cd ..
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run build --if-present
- run: npm run build
- run: npm test
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
flag-name: run-${{ matrix.test_number }}
parallel: true

finish:
needs: test
runs-on: ubuntu-18.04
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
4 changes: 2 additions & 2 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand All @@ -23,7 +23,7 @@ jobs:

publish-npm:
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
publish:
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
steps:
-
name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
/public
/.cache
/.parcel-cache
/coverage
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# egm96-universal

[![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)
[![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)

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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"convert-data": "node ./convertDataFile.js",
"test": "npm run prebuild && npm run lint && npm run jest",
"lint": "npm run prebuild && eslint \"*.js\" \"src/**/*.js\"",
"jest": "npm run prebuild && jest",
"jest": "npm run prebuild && jest --config=./jest.config.js --coverage",
"build": "npm run rollup",
"rollup": "rollup -c",
"website-build": "npm run prebuild && parcel build demo/index.html --dist-dir public --public-url ./",
Expand Down
3 changes: 0 additions & 3 deletions src/egm96.reference.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable */

import * as egm96 from './egm96'
import * as cp from 'child_process'
Expand Down Expand Up @@ -94,7 +93,6 @@ test('empty test', () => {
expect(true).toBe(true)
})

/*
test('intersection test', () => {
const coords = []
for (let a = -85; a <= 85; a += 20) {
Expand All @@ -114,7 +112,6 @@ test('non intersection test', () => {
testComparison(lat, lon, false)
}
})
*/

// 100 randomly generated coordinates
const samples = [
Expand Down

0 comments on commit cac8ddf

Please sign in to comment.