diff --git a/.travis.yml b/.travis.yml index f9f0186..ce58af5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,17 +4,23 @@ cache: directories: - '$HOME/.npm' before_install: - - if [ "$TRAVIS_BRANCH" = "master" ]; then git remote set-branches --add origin web; git fetch origin web; git checkout web; fi -script: npm run build -deploy: - provider: s3 - access_key_id: ztDf0fCxr0eCgSIi - secret_access_key: - secure: - pqtYVC6ztu5Nowklu5vjXY8LUyQZ/8kGj7Dds9eWxNuDJbxrC8FGaTZRkRTEakbFtDTU78jiaaIn8FXYEyeGW7AmkU+V20Nc2TV5HWPVIiHyodfRul6PYZT6ad5iSCsNeU7xRr+aI4UtFGxwbox+aVEDB9+j9Nnbt0wagE+sOsQnY2Pzwgf9/AepBjgjg3owcJ1fYTw0IMlejfR1yQIriel9WzrQNWC/QFunihAAPZRNyvNui33YP3m49+HXzk1a/tKtP1U/twI4/ygqGWQG2e8UvxIIew0Jt+Io84AgP5koAGAZIr4s8Yl+6BvnOKA73n4gjHYYo/ASfmnzQ6yUIS2OkKPEqwHf3kx4fWYU3wzDoB+BpH8LxgcLVoKWZKa7HVXMY/3yyGDcOfKBS78R8zqRqut0OfMuSAg4/rocp1jtUFOg0Cw0/F69wo2yQVCfZu5JWPfpKtF8iiLyuJcNOB9oTirXNcSFriNMG+T2QmqemG6XxlBzj+ZFIJqOMOcHgUiEF6z4/rwly17/m5gNUSbSoUpvpTSu/ioqzj9RT1Z6EpfqEGvkdpOna7/tdCQBpqFqy+ofjQLzuurKSCDeNx9gOHh6oQJ8ozj6G+KHWR25GpL96/ZscTl9UqTyqypnwtgjEgDR29viKGEFVWpf70uigi2w0lMYDC4Lop4FOuQ= - bucket: satori - skip_cleanup: true - local-dir: dist/dress - endpoint: https://minio.moecube.com/satori - on: - all_branches: true + - 'if [ "$TRAVIS_BRANCH" = "master" ]; then git remote set-branches --add origin web; git fetch origin web; git checkout web; fi' +script: + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/getGHPage.sh; fi' + - 'npm run build' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/pushGHPage.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/getGHPage_drsrel.sh; fi' + - 'npm run build' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/pushGHPage.sh; fi' +# deploy: +# provider: s3 +# access_key_id: ztDf0fCxr0eCgSIi +# secret_access_key: +# secure: +# pqtYVC6ztu5Nowklu5vjXY8LUyQZ/8kGj7Dds9eWxNuDJbxrC8FGaTZRkRTEakbFtDTU78jiaaIn8FXYEyeGW7AmkU+V20Nc2TV5HWPVIiHyodfRul6PYZT6ad5iSCsNeU7xRr+aI4UtFGxwbox+aVEDB9+j9Nnbt0wagE+sOsQnY2Pzwgf9/AepBjgjg3owcJ1fYTw0IMlejfR1yQIriel9WzrQNWC/QFunihAAPZRNyvNui33YP3m49+HXzk1a/tKtP1U/twI4/ygqGWQG2e8UvxIIew0Jt+Io84AgP5koAGAZIr4s8Yl+6BvnOKA73n4gjHYYo/ASfmnzQ6yUIS2OkKPEqwHf3kx4fWYU3wzDoB+BpH8LxgcLVoKWZKa7HVXMY/3yyGDcOfKBS78R8zqRqut0OfMuSAg4/rocp1jtUFOg0Cw0/F69wo2yQVCfZu5JWPfpKtF8iiLyuJcNOB9oTirXNcSFriNMG+T2QmqemG6XxlBzj+ZFIJqOMOcHgUiEF6z4/rwly17/m5gNUSbSoUpvpTSu/ioqzj9RT1Z6EpfqEGvkdpOna7/tdCQBpqFqy+ofjQLzuurKSCDeNx9gOHh6oQJ8ozj6G+KHWR25GpL96/ZscTl9UqTyqypnwtgjEgDR29viKGEFVWpf70uigi2w0lMYDC4Lop4FOuQ= +# bucket: satori +# skip_cleanup: true +# local-dir: dist/dress +# endpoint: https://minio.moecube.com/satori +# on: +# all_branches: true diff --git a/AkechiSatori/IMG_20181016_000541.jpg b/AkechiSatori/IMG_20181016_000541.jpg new file mode 100644 index 0000000..4eb3b6a Binary files /dev/null and b/AkechiSatori/IMG_20181016_000541.jpg differ diff --git a/AkechiSatori/faceu_1546879402897.JPG b/AkechiSatori/faceu_1546879402897.JPG new file mode 100644 index 0000000..a991e2d Binary files /dev/null and b/AkechiSatori/faceu_1546879402897.JPG differ diff --git a/Makito/Chiffon.jpg b/Makito/Chiffon.jpg new file mode 100644 index 0000000..b53f08a Binary files /dev/null and b/Makito/Chiffon.jpg differ diff --git a/Makito/Nekomimi.jpg b/Makito/Nekomimi.jpg new file mode 100644 index 0000000..213d6e0 Binary files /dev/null and b/Makito/Nekomimi.jpg differ diff --git a/README.md b/README.md index 28fdd6e..da1a231 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,17 @@ ## Dress - 面向可爱的蓝孩子 (/ω\) 的 git 学习实践项目 on GitHub + +[![Build Status](https://www.travis-ci.org/komeiji-satori/Dress.svg?branch=master)](https://www.travis-ci.org/komeiji-satori/Dress) + #### 项目很简单且并不要求你贡献代码,没有编程技能都可以参加。你可以从这里学习从克隆项目,创建分支,提交和同步修改,到合并分支请求的整套流程,一次即可熟悉 git/github 的使用。 + #### 当然,你还要事先准备至少一张你的女装照。 +- [https://drsrel.github.io/](https://drsrel.github.io/) + +- [http://satori.mycard.moe/](http://satori.mycard.moe/) + +- [https://wearadress.org/](https://wearadress.org/) -## Contributors +### Contributors ![contributors.svg](https://opencollective.com/Dress/contributors.svg?width=890&button=false)