Skip to content

Commit

Permalink
Merge pull request #8 from jolocom/feature/update_ci
Browse files Browse the repository at this point in the history
Feature/update ci
  • Loading branch information
Exulansis authored Sep 21, 2019
2 parents 36af9ae + b8eed46 commit 429ce6a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,20 @@ jobs:

strategy:
matrix:
node-version: [8.x, 10.x, 12.x]
node-version: [10.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, build, and test
- name: yarn install, build and test
run: |
npm install
npm run build --if-present
npm test
yarn install
yarn build
yarn test
env:
CI: true
BLOCK_TIME: 0.5
REQUESTS: 320
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
.idea
yarn-error.log
js
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"start": "ts-node ./ts/server.ts",
"build": "rm -rf ./js; tsc -p ./tsconfig.json",
"test": "mocha --opts ./mocha.opts ./tests/index.ts"
"test": "mocha --opts ./mocha.opts ./tests/index.ts --exit"
},
"husky": {
"hooks": {
Expand Down
2 changes: 1 addition & 1 deletion tests/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe("Fueling service integration tests", () => {
});

const pings = new Array(nrOfRequests).fill(0).map(ping)
return Promise.all(pings).then(testFuelingService.getAllBalances).then(console.log)
return Promise.all(pings)
})
})

Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"!./node_modules/**/*.ts"
],
"exclude": [
"./js"
"./js",
"./tests"
]
}

0 comments on commit 429ce6a

Please sign in to comment.