diff --git a/.aegir.js b/.aegir.js index 5d87aa66d7..43915d90d6 100644 --- a/.aegir.js +++ b/.aegir.js @@ -21,7 +21,6 @@ module.exports = { included: false }], browserNoActivityTimeout: 100 * 1000, - singleRun: true }, hooks: { node: { diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..7ac2353455 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +* text=auto +test/** text eol=lf +src/init-files/** text eol=lf + +*.data binary +*.png binary +*.jpg binary diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..e0d74ff547 --- /dev/null +++ b/.travis.yml @@ -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 diff --git a/README.md b/README.md index 541eca795c..8c3b08a394 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@
-
+
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
deleted file mode 100644
index a7da2e54f3..0000000000
--- a/ci/Jenkinsfile
+++ /dev/null
@@ -1,2 +0,0 @@
-// Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
-javascript()
diff --git a/package.json b/package.json
index 1c4e6c5545..6c0dc7d60c 100644
--- a/package.json
+++ b/package.json
@@ -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",
@@ -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",
diff --git a/test/cli/config.js b/test/cli/config.js
index 2150c39e2c..1687f2d7fb 100644
--- a/test/cli/config.js
+++ b/test/cli/config.js
@@ -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