From 0621f07a2cbd30796195e8910e1ee9767ff573d4 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 19 Sep 2016 11:40:08 -0700 Subject: [PATCH] refactor: misc cleanup --- .travis.yml | 146 ------------------------------------- tools/check-environment.js | 11 +-- 2 files changed, 4 insertions(+), 153 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8194137c1a..3bdb05466f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,20 +20,9 @@ cache: directories: - ./node_modules - ./.chrome/chromium -# - $HOME/.pub-cache - - -#before_cache: -# # Undo the pollution of the typescript_next build before the cache is primed for future use -# - if [[ "$MODE" == "typescript_next" ]]; then npm install typescript; fi env: global: -# - KARMA_JS_BROWSERS=ChromeNoSandbox -# - E2E_BROWSERS=ChromeOnTravis -# - LOGS_DIR=/tmp/angular-build/logs -# - ARCH=linux-x64 - # GITHUB_TOKEN_ANGULAR # This is needed for the e2e Travis matrix task to publish packages to github for continuous packages delivery. - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo=" @@ -52,146 +41,11 @@ matrix: - env: "CI_MODE=saucelabs_optional" - env: "CI_MODE=browserstack_optional" - install: - ./scripts/ci-lite/install.sh -before_script: - - script: - ./scripts/ci-lite/build.sh && ./scripts/ci-lite/test.sh after_script: - ./scripts/ci-lite/cleanup.sh - - -#branches: -# except: -# - g3_v2_0 -# -#cache: -# directories: -# - $HOME/.pub-cache -# - $HOME/.chrome/chromium -# -#before_cache: -# # Undo the pollution of the typescript_next build before the cache is primed for future use -# - if [[ "$MODE" == "typescript_next" ]]; then npm install typescript; fi -# -#env: -# global: -# # Use newer verison of GCC to that is required to compile native npm modules for Node v4+ on Ubuntu Precise -# # more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements -# - CXX=g++-4.8 -# - KARMA_DART_BROWSERS=DartiumWithWebPlatform -# # No sandbox mode is needed for Chromium in Travis, it crashes otherwise: https://sites.google.com/a/chromium.org/chromedriver/help/chrome-doesn-t-start -# - KARMA_JS_BROWSERS=ChromeNoSandbox -# - E2E_BROWSERS=ChromeOnTravis -# - LOGS_DIR=/tmp/angular-build/logs -# - SAUCE_USERNAME=angular-ci -# - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987 -# - BROWSER_STACK_USERNAME=angularteam1 -# - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB -# - ARCH=linux-x64 -# - DART_DEV_VERSION=latest -# - DART_STABLE_VERSION=latest -# - DART_CHANNEL=stable -# - DART_VERSION=$DART_STABLE_VERSION -# # Token for tsd to increase github rate limit -# # See https://github.com/DefinitelyTyped/tsd#tsdrc -# # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables -# # because those are not visible for pull requests, and those should also be reliable. -# # This SSO token belongs to github account angular-github-ratelimit-token which has no access -# # (password is in Valentine) -# - TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}' -# # GITHUB_TOKEN_ANGULAR -# - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo=" -# matrix: -# # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete. -# - MODE=dart -# - MODE=dart DART_CHANNEL=dev -# - MODE=saucelabs_required -# - MODE=browserstack_required -# - MODE=saucelabs_optional -# - MODE=browserstack_optional -# - MODE=dart_ddc -# - MODE=js -# - MODE=router -# - MODE=build_only -# - MODE=typescript_next -# - MODE=lint -# -#matrix: -# allow_failures: -# - env: "MODE=saucelabs_optional" -# - env: "MODE=browserstack_optional" -# -#addons: -# firefox: "38.0" -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - g++-4.8 -# -#before_install: -# - node tools/analytics/build-analytics start ci job -# - node tools/analytics/build-analytics start ci before_install -# - echo ${TSDRC} > .tsdrc -# - export CHROME_BIN=$HOME/.chrome/chromium/chrome-linux/chrome -# - export DISPLAY=:99.0 -# - export GIT_SHA=$(git rev-parse HEAD) -# - ./scripts/ci/init_android.sh -# - sh -e /etc/init.d/xvfb start -# # Use a separate SauseLabs account for upstream/master builds in order for Sauce to create a badge representing the status of just upstream/master -# - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true' -# - node tools/analytics/build-analytics success ci before_install -# -#install: -# - node tools/analytics/build-analytics start ci install -# # Install version of npm that we are locked against -# - npm install -g npm@3.5.3 -# # Install version of Chromium that we are locked against -# - ./scripts/ci/install_chromium.sh -# # Install version of Dart based on the matrix build variables -# - ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH} -# # Print the size of caches to ease debugging -# - du -sh ./node_modules || true -# # Install npm dependecies -# # check-node-modules will exit(1) if we don't need to install -# # we need to manually kick off the postinstall script if check-node-modules exit(0)s -# - node tools/npm/check-node-modules --purge && npm install || npm run postinstall -# - node tools/analytics/build-analytics success ci install -# -#before_script: -# - node tools/analytics/build-analytics start ci before_script -# - mkdir -p $LOGS_DIR -# - ./scripts/ci/presubmit-queue-setup.sh -# - node tools/analytics/build-analytics success ci before_script -# -#script: -# - node tools/analytics/build-analytics start ci script -# - ./scripts/ci/build_and_test.sh ${MODE} -# - node tools/analytics/build-analytics success ci script -# -#after_script: -# - node tools/analytics/build-analytics start ci after_script -# - ./scripts/ci/print-logs.sh -# - ./scripts/ci/after-script.sh -# - ./scripts/publish/publish-build-artifacts.sh -# - node tools/analytics/build-analytics success ci after_script -# - tools/analytics/build-analytics $TRAVIS_TEST_RESULT ci job -# -#notifications: -# webhooks: -# urls: -# - https://webhooks.gitter.im/e/1ef62e23078036f9cee4 -# # trigger Buildtime Trend Service to parse Travis CI log -# - https://buildtimetrend.herokuapp.com/travis -# - http://104.197.9.155:8484/hubot/travis/activity -# on_success: always # options: [always|never|change] default: always -# on_failure: always # options: [always|never|change] default: always -# on_start: never # default: never -# slack: -# secure: EP4MzZ8JMyNQJ4S3cd5LEPWSMjC7ZRdzt3veelDiOeorJ6GwZfCDHncR+4BahDzQAuqyE/yNpZqaLbwRWloDi15qIUsm09vgl/1IyNky1Sqc6lEknhzIXpWSalo4/T9ZP8w870EoDvM/UO+LCV99R3wS8Nm9o99eLoWVb2HIUu0= diff --git a/tools/check-environment.js b/tools/check-environment.js index 8cbede5837..9ad9cf00ce 100644 --- a/tools/check-environment.js +++ b/tools/check-environment.js @@ -12,13 +12,11 @@ var exec = require('child_process').exec; var checkNodeModules; var semver; - - var issues = []; // coarse Node version check -if (Number.parseInt(process.version[1], 10) < 5) { - issues.push("Angular 2 build currently requires Node 5. Use nvm to update your node version."); +if (+process.version[1] < 5) { + issues.push("Angular 2 build currently requires Node 5+. Use nvm to update your node version."); } try { @@ -46,7 +44,6 @@ try { printWarning(issues); } - function checkEnvironment(reqs) { exec('npm --version', function(e, stdout) { @@ -77,10 +74,10 @@ function printWarning(issues) { if (!issues.length) return; console.warn(''); - console.warn(Array(110).join('!')); + console.warn('!'.repeat(110)); console.warn('!!! Your environment is not in a good shape. Following issues were found:'); issues.forEach(function(issue) {console.warn('!!! - ' + issue);}); - console.warn(Array(110).join('!')); + console.warn('!'.repeat(110)); console.warn(''); if (process.env.CI) {