From eba5f6b738cc860a77cbf04aa1faf94f4001eeaf Mon Sep 17 00:00:00 2001 From: Zhicheng WANG Date: Wed, 2 Jan 2019 22:05:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BD=BF=E7=94=A8=20t?= =?UTF-8?q?ravis=20=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 61 ++++++++---------------------------------------- aio/deploy-cn.sh | 2 +- 2 files changed, 11 insertions(+), 52 deletions(-) diff --git a/.travis.yml b/.travis.yml index e28c043737..add582f4be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,65 +2,24 @@ language: node_js sudo: false dist: trusty node_js: - - '10.9.0' - +- 10.9.0 addons: -# firefox: "38.0" apt: sources: - # needed to install g++ that is used by npms's native modules - - ubuntu-toolchain-r-test + - ubuntu-toolchain-r-test packages: - # needed to install g++ that is used by npms's native modules - - g++-4.8 - + - g++-4.8 branches: except: - - g3 - + - g3 cache: yarn: true directories: - - ./node_modules - - ./.chrome/chromium - - ./aio/node_modules - -env: - global: - # GITHUB_TOKEN_ANGULAR= - # This is needed for the e2e Travis matrix task to publish packages to github for continuous packages delivery. - - secure: "aCdHveZuY8AT4Jr1JoJB4LxZsnGWRe/KseZh1YXYe5UtufFCtTVHvUcLn0j2aLBF0KpdyS+hWf0i4np9jthKu2xPKriefoPgCMpisYeC0MFkwbmv+XlgkUbgkgVZMGiVyX7DCYXVahxIoOUjVMEDCbNiHTIrfEuyq24U3ok2tHc=" - matrix: - # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete. - - CI_MODE=e2e - - CI_MODE=js - - CI_MODE=saucelabs_required - # deactivated, see #19768 - # - CI_MODE=browserstack_required - - # We disable these optional jobs because those acquire tunnel and browser instances which - # could lead to rate limit excess while those are failing most of the time and nobody pays - # attention anyway. - # - CI_MODE=saucelabs_optional - # - CI_MODE=browserstack_optional - -matrix: - fast_finish: true - allow_failures: - - env: "CI_MODE=saucelabs_optional" - - env: "CI_MODE=browserstack_optional" - + - "./node_modules" + - "./.chrome/chromium" + - "./aio/node_modules" before_install: - # source the env.sh script so that the exported variables are available to other scripts later on - - source ./scripts/ci/env.sh print - -install: - - ./scripts/ci/install.sh - +- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.10.1 +- export PATH="$HOME/.yarn/bin:$PATH" script: - - ./scripts/ci/build.sh - - ./scripts/ci/test.sh - - ./scripts/ci/angular.sh - # all the scripts under this line will not quickly abort in case ${TRAVIS_TEST_RESULT} is 1 (job failure) - - ./scripts/ci/cleanup.sh - - ./scripts/ci/print-logs.sh +- "./aio/deploy-cn.sh" diff --git a/aio/deploy-cn.sh b/aio/deploy-cn.sh index 341aa35f7c..a6e7ca7053 100755 --- a/aio/deploy-cn.sh +++ b/aio/deploy-cn.sh @@ -13,7 +13,7 @@ ts-node ./tools/translator/bin/ssr.ts if [[ ! -d "./ng-docs.github.io" ]] then - git clone git@github.com:ng-docs/ng-docs.github.io.git ./ng-docs.github.io + git clone https://asnowwolf:${GITHUB_ACCESS_TOKEN}@github.com/ng-docs/ng-docs.github.io.git ./ng-docs.github.io fi cp -r dist/* ./ng-docs.github.io