Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
Merge 14f885c into 52e88c8
Browse files Browse the repository at this point in the history
  • Loading branch information
xudafeng committed Jul 27, 2020
2 parents 52e88c8 + 14f885c commit 10d7ecc
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .eslintignore
@@ -1,4 +1,4 @@
**/.*
**/node_modules
**/coverage/
**/docs_dist/
**/coverage
**/docs_dist
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -8,8 +8,9 @@ addons:
install:
- export DISPLAY=':99.0'
- Xvfb :99 -screen 0 1366x768x24 > /dev/null 2>&1 &
- npm i vuepress macaca-ecosystem
- npm run docs:build
- npm i macaca-ecosystem
- npm i vuepress -g
- vuepress build docs
script:
- npm i
- $(npm bin)/macaca-ecosystem push --cwd ./docs_dist --branch gh-pages
Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -15,8 +15,8 @@
[coveralls-url]: https://coveralls.io/r/macacajs/torchjs?branch=master
[download-image]: https://img.shields.io/npm/dm/torchjs.svg?style=flat-square
[download-url]: https://npmjs.org/package/torchjs
[babel-image]: https://img.shields.io/badge/babel-7-green.svg?style=flat-square
[babel-url]: https://vuejs.org/
[babel-image]: https://img.shields.io/badge/babel-9-green.svg?style=flat-square
[babel-url]: https://github.com/babel/babel
[electron-image]: https://img.shields.io/badge/electron-7-green.svg?style=flat-square
[electron-url]: https://electronjs.org/

Expand All @@ -28,11 +28,11 @@ Test framework to light up the world.

## Contributors

|[<img src="https://avatars1.githubusercontent.com/u/1011681?v=4" width="100px;"/><br/><sub><b>xudafeng</b></sub>](https://github.com/xudafeng)<br/>|[<img src="https://avatars1.githubusercontent.com/u/1655789?v=4" width="100px;"/><br/><sub><b>leungwensen</b></sub>](https://github.com/leungwensen)<br/>|[<img src="https://avatars1.githubusercontent.com/u/11460601?v=4" width="100px;"/><br/><sub><b>zivyangll</b></sub>](https://github.com/zivyangll)<br/>|[<img src="https://avatars3.githubusercontent.com/u/1209810?v=4" width="100px;"/><br/><sub><b>paradite</b></sub>](https://github.com/paradite)<br/>|[<img src="https://avatars3.githubusercontent.com/u/356347?v=4" width="100px;"/><br/><sub><b>loftyet</b></sub>](https://github.com/loftyet)<br/>|
|[<img src="https://avatars1.githubusercontent.com/u/1011681?v=4" width="100px;"/><br/><sub><b>xudafeng</b></sub>](https://github.com/xudafeng)<br/>|[<img src="https://avatars1.githubusercontent.com/u/1655789?v=4" width="100px;"/><br/><sub><b>leungwensen</b></sub>](https://github.com/leungwensen)<br/>|[<img src="https://avatars1.githubusercontent.com/u/11460601?v=4" width="100px;"/><br/><sub><b>zivyangll</b></sub>](https://github.com/zivyangll)<br/>|[<img src="https://avatars3.githubusercontent.com/u/1209810?v=4" width="100px;"/><br/><sub><b>paradite</b></sub>](https://github.com/paradite)<br/>|[<img src="https://avatars3.githubusercontent.com/u/356347?v=4" width="100px;"/><br/><sub><b>liangjun-jiang</b></sub>](https://github.com/liangjun-jiang)<br/>|
| :---: | :---: | :---: | :---: | :---: |


This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Thu Jan 16 2020 23:02:40 GMT+0800`.
This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Mon Jul 27 2020 13:30:12 GMT+0800`.

<!-- GITCONTRIBUTOR_END -->

Expand Down
File renamed without changes.
7 changes: 3 additions & 4 deletions package.json
Expand Up @@ -17,8 +17,7 @@
"test-http": "node bin/torch --dom-global --compile --http test/main",
"test-http-live": "node bin/torch --compile --http --interactive test/renderer",
"contributor": "git-contributor",
"docs:dev": "vuepress dev docs",
"docs:build": "vuepress build docs"
"docs:dev": "vuepress dev docs"
},
"husky": {
"hooks": {
Expand Down Expand Up @@ -66,13 +65,13 @@
"which": "~1.2.14"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"babel-loader": "^7.1.5",
"eslint": "^4.19.1",
"eslint-plugin-mocha": "^5.0.0",
"git-contributor": "1",
"husky": "1",
"macaca-ecosystem": "*",
"vuepress": "^0.14.8"
"vuepress": "^1.5.2"
}
}

0 comments on commit 10d7ecc

Please sign in to comment.