Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

feat: move to travis-ci.com #1728

Merged
merged 19 commits into from
Feb 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .aegir.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module.exports = {
included: false
}],
browserNoActivityTimeout: 100 * 1000,
singleRun: true
},
hooks: {
node: {
Expand Down
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
* text=auto
test/** text eol=lf
src/init-files/** text eol=lf

*.data binary
*.png binary
*.jpg binary
44 changes: 44 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
language: node_js
cache: npm
stages:
- check
- test
- cov

node_js:
- '10'

os:
- linux
- osx
- windows

script: npx nyc -s npm run test:node -- --bail
after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov

jobs:
include:
- stage: check
script:
- npx aegir commitlint --travis
- npx aegir dep-check -- -i wrtc -i electron-webrtc
- npm run lint

- stage: test
name: chrome
addons:
chrome: stable
script:
- npx aegir test -t browser
- npx aegir test -t webworker

- stage: test
name: firefox
addons:
firefox: latest
script:
- npx aegir test -t browser -- --browsers FirefoxHeadless
- npx aegir test -t webworker -- --browsers FirefoxHeadless

notifications:
email: false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</p>

<p align="center">
<a href="https://ci.ipfs.team/job/ipfs/job/js-ipfs/job/master/"><img src="https://ci.ipfs.team/buildStatus/icon?job=ipfs/js-ipfs/master" /></a>
<a href="https://travis-ci.com/ipfs/aegir"><img src="https://flat.badgen.net/travis/ipfs/js-ipfs" /></a>
<a href="https://codecov.io/gh/ipfs/js-ipfs"><img src="https://codecov.io/gh/ipfs/js-ipfs/branch/master/graph/badge.svg" /></a>
<a href="https://david-dm.org/ipfs/js-ipfs"><img src="https://david-dm.org/ipfs/js-ipfs.svg?style=flat" /></a>
<a href="https://github.com/feross/standard"><img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat"></a>
Expand Down
2 changes: 0 additions & 2 deletions ci/Jenkinsfile

This file was deleted.

7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@
"benchmark:browser": "echo \"Error: no benchmarks yet\" && exit 1",
"release": "aegir release -t node -t browser",
"release-minor": "aegir release --type minor -t node -t browser",
"release-major": "aegir release --type major -t node -t browser",
"coverage": "aegir coverage",
"coverage-publish": "aegir-coverage publish",
"dep-check": "npx dependency-check package.json './test/**/*.js' './src/**/*.js'"
"release-major": "aegir release --type major -t node -t browser"
},
"repository": {
"type": "git",
Expand All @@ -62,7 +59,7 @@
},
"homepage": "https://github.com/ipfs/js-ipfs#readme",
"devDependencies": {
"aegir": "^18.0.3",
"aegir": "^18.1.0",
"chai": "^4.2.0",
"delay": "^4.1.0",
"detect-node": "^2.0.4",
Expand Down
2 changes: 1 addition & 1 deletion test/cli/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('config', () => runOnAndOff((thing) => {

it('call config with no arguments', () => {
return ipfs('config')
.then(out => expect(out).to.include('bin.js config <key> [value]'))
.then(out => expect(out).to.include('Not enough non-option arguments: got 0, need at least 1'))
})
})

Expand Down
6 changes: 3 additions & 3 deletions test/cli/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe('files', () => runOnAndOff((thing) => {
return ipfs('add test/fixtures/greater-than-default-max-chunk-size --cid-version=1')
.then((out) => {
expect(out)
.to.eql('added zdj7WbyyZoWVifUHUe58SNS184PpN8qAuCP6HpAY91iA8CveT greater-than-default-max-chunk-size\n')
.to.eql('added zdj7We8b7taMubqinMgnZ9HFUiv17bm5zjJkYnqpfxXhqx5sY greater-than-default-max-chunk-size\n')
})
})

Expand All @@ -253,7 +253,7 @@ describe('files', () => runOnAndOff((thing) => {
return ipfs(`add test/fixtures/greater-than-default-max-chunk-size --cid-version=1 --raw-leaves=false`)
.then((out) => {
expect(out)
.to.eql('added zdj7WmYojH6vMkDQFNDNwUy2ZawrggqAhS6jjRJwb1C4KXZni greater-than-default-max-chunk-size\n')
.to.eql('added zdj7WW4sSVxNKLJXQSzy3RD7msG3SS4WgdGEdJzDZ7swYv65p greater-than-default-max-chunk-size\n')
})
})

Expand All @@ -273,7 +273,7 @@ describe('files', () => runOnAndOff((thing) => {
return ipfs('add test/fixtures/greater-than-default-max-chunk-size --cid-version=1 --raw-leaves=true')
.then((out) => {
expect(out)
.to.eql('added zdj7WbyyZoWVifUHUe58SNS184PpN8qAuCP6HpAY91iA8CveT greater-than-default-max-chunk-size\n')
.to.eql('added zdj7We8b7taMubqinMgnZ9HFUiv17bm5zjJkYnqpfxXhqx5sY greater-than-default-max-chunk-size\n')
})
})

Expand Down
Binary file modified test/fixtures/greater-than-default-max-chunk-size
Binary file not shown.