From d15b4822f8f2d2ca62b340d1efb1246e7b053fa1 Mon Sep 17 00:00:00 2001 From: Zhicheng WANG Date: Wed, 29 Jan 2020 15:18:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20git=20commit=20?= =?UTF-8?q?=E6=97=B6=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 怀疑是因为单个命令的响应时间过长或负载过重而被 kill 了,改成分批添加和提交文件后问题解决 --- .travis.yml | 23 +++++++++-------------- aio/deploy-cn.sh | 20 +++++++++++++++++++- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9abf25d610..e6f8d6c248 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,26 +2,21 @@ language: node_js sudo: false dist: trusty node_js: -- 10.13.0 + - 10.13.0 addons: apt: sources: - - ubuntu-toolchain-r-test + - ubuntu-toolchain-r-test packages: - - g++-4.8 + - g++-4.8 chrome: stable branches: except: - - g3 -cache: - yarn: true - directories: - - "./node_modules" - - "./.chrome/chromium" - - "./aio/node_modules" + - g3 +cache: false before_install: -- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 -- export PATH="$HOME/.yarn/bin:$PATH" -- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost & + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 + - export PATH="$HOME/.yarn/bin:$PATH" + - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost & script: -- "./aio/deploy-cn.sh" + - "./aio/deploy-cn.sh" diff --git a/aio/deploy-cn.sh b/aio/deploy-cn.sh index 925b80586b..c54f2016f8 100755 --- a/aio/deploy-cn.sh +++ b/aio/deploy-cn.sh @@ -10,6 +10,16 @@ cd `dirname $0` yarn build +yarn preview > /tmp/preview.log & + +pid=$! + +sleep 3; + +node ./tools/translator/bin/prerender.js + +kill -9 ${pid} + if [[ ! -d "./ng-docs.github.io" ]] then git clone https://asnowwolf:${GITHUB_ACCESS_TOKEN}@github.com/ng-docs/preview.angular.cn.git ./ng-docs.github.io @@ -19,8 +29,16 @@ cp -r dist/* ./ng-docs.github.io cd ./ng-docs.github.io -git add . +git add ./generated/docs/api/ git commit --allow-empty -am "${commitMessage}" +git add ./generated/docs/guide/ +git commit --amend --allow-empty -am "${commitMessage}" +git add ./generated/docs/ +git commit --amend --allow-empty -am "${commitMessage}" +git add ./generated/images/ +git commit --amend --allow-empty -am "${commitMessage}" +git add . +git commit --amend --allow-empty -am "${commitMessage}" git push