Skip to content

Commit 0621f07

Browse files
vicbalexeagle
authored andcommitted
refactor: misc cleanup
1 parent 1225ecf commit 0621f07

File tree

2 files changed

+4
-153
lines changed

2 files changed

+4
-153
lines changed

.travis.yml

Lines changed: 0 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,9 @@ cache:
2020
directories:
2121
- ./node_modules
2222
- ./.chrome/chromium
23-
# - $HOME/.pub-cache
24-
25-
26-
#before_cache:
27-
# # Undo the pollution of the typescript_next build before the cache is primed for future use
28-
# - if [[ "$MODE" == "typescript_next" ]]; then npm install typescript; fi
2923

3024
env:
3125
global:
32-
# - KARMA_JS_BROWSERS=ChromeNoSandbox
33-
# - E2E_BROWSERS=ChromeOnTravis
34-
# - LOGS_DIR=/tmp/angular-build/logs
35-
# - ARCH=linux-x64
36-
3726
# GITHUB_TOKEN_ANGULAR
3827
# This is needed for the e2e Travis matrix task to publish packages to github for continuous packages delivery.
3928
- secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
@@ -52,146 +41,11 @@ matrix:
5241
- env: "CI_MODE=saucelabs_optional"
5342
- env: "CI_MODE=browserstack_optional"
5443

55-
5644
install:
5745
- ./scripts/ci-lite/install.sh
5846

59-
before_script:
60-
61-
6247
script:
6348
- ./scripts/ci-lite/build.sh && ./scripts/ci-lite/test.sh
6449

6550
after_script:
6651
- ./scripts/ci-lite/cleanup.sh
67-
68-
69-
#branches:
70-
# except:
71-
# - g3_v2_0
72-
#
73-
#cache:
74-
# directories:
75-
# - $HOME/.pub-cache
76-
# - $HOME/.chrome/chromium
77-
#
78-
#before_cache:
79-
# # Undo the pollution of the typescript_next build before the cache is primed for future use
80-
# - if [[ "$MODE" == "typescript_next" ]]; then npm install typescript; fi
81-
#
82-
#env:
83-
# global:
84-
# # Use newer verison of GCC to that is required to compile native npm modules for Node v4+ on Ubuntu Precise
85-
# # more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
86-
# - CXX=g++-4.8
87-
# - KARMA_DART_BROWSERS=DartiumWithWebPlatform
88-
# # 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
89-
# - KARMA_JS_BROWSERS=ChromeNoSandbox
90-
# - E2E_BROWSERS=ChromeOnTravis
91-
# - LOGS_DIR=/tmp/angular-build/logs
92-
# - SAUCE_USERNAME=angular-ci
93-
# - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
94-
# - BROWSER_STACK_USERNAME=angularteam1
95-
# - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
96-
# - ARCH=linux-x64
97-
# - DART_DEV_VERSION=latest
98-
# - DART_STABLE_VERSION=latest
99-
# - DART_CHANNEL=stable
100-
# - DART_VERSION=$DART_STABLE_VERSION
101-
# # Token for tsd to increase github rate limit
102-
# # See https://github.com/DefinitelyTyped/tsd#tsdrc
103-
# # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
104-
# # because those are not visible for pull requests, and those should also be reliable.
105-
# # This SSO token belongs to github account angular-github-ratelimit-token which has no access
106-
# # (password is in Valentine)
107-
# - TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
108-
# # GITHUB_TOKEN_ANGULAR
109-
# - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
110-
# matrix:
111-
# # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
112-
# - MODE=dart
113-
# - MODE=dart DART_CHANNEL=dev
114-
# - MODE=saucelabs_required
115-
# - MODE=browserstack_required
116-
# - MODE=saucelabs_optional
117-
# - MODE=browserstack_optional
118-
# - MODE=dart_ddc
119-
# - MODE=js
120-
# - MODE=router
121-
# - MODE=build_only
122-
# - MODE=typescript_next
123-
# - MODE=lint
124-
#
125-
#matrix:
126-
# allow_failures:
127-
# - env: "MODE=saucelabs_optional"
128-
# - env: "MODE=browserstack_optional"
129-
#
130-
#addons:
131-
# firefox: "38.0"
132-
# apt:
133-
# sources:
134-
# - ubuntu-toolchain-r-test
135-
# packages:
136-
# - g++-4.8
137-
#
138-
#before_install:
139-
# - node tools/analytics/build-analytics start ci job
140-
# - node tools/analytics/build-analytics start ci before_install
141-
# - echo ${TSDRC} > .tsdrc
142-
# - export CHROME_BIN=$HOME/.chrome/chromium/chrome-linux/chrome
143-
# - export DISPLAY=:99.0
144-
# - export GIT_SHA=$(git rev-parse HEAD)
145-
# - ./scripts/ci/init_android.sh
146-
# - sh -e /etc/init.d/xvfb start
147-
# # Use a separate SauseLabs account for upstream/master builds in order for Sauce to create a badge representing the status of just upstream/master
148-
# - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true'
149-
# - node tools/analytics/build-analytics success ci before_install
150-
#
151-
#install:
152-
# - node tools/analytics/build-analytics start ci install
153-
# # Install version of npm that we are locked against
154-
# - npm install -g npm@3.5.3
155-
# # Install version of Chromium that we are locked against
156-
# - ./scripts/ci/install_chromium.sh
157-
# # Install version of Dart based on the matrix build variables
158-
# - ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH}
159-
# # Print the size of caches to ease debugging
160-
# - du -sh ./node_modules || true
161-
# # Install npm dependecies
162-
# # check-node-modules will exit(1) if we don't need to install
163-
# # we need to manually kick off the postinstall script if check-node-modules exit(0)s
164-
# - node tools/npm/check-node-modules --purge && npm install || npm run postinstall
165-
# - node tools/analytics/build-analytics success ci install
166-
#
167-
#before_script:
168-
# - node tools/analytics/build-analytics start ci before_script
169-
# - mkdir -p $LOGS_DIR
170-
# - ./scripts/ci/presubmit-queue-setup.sh
171-
# - node tools/analytics/build-analytics success ci before_script
172-
#
173-
#script:
174-
# - node tools/analytics/build-analytics start ci script
175-
# - ./scripts/ci/build_and_test.sh ${MODE}
176-
# - node tools/analytics/build-analytics success ci script
177-
#
178-
#after_script:
179-
# - node tools/analytics/build-analytics start ci after_script
180-
# - ./scripts/ci/print-logs.sh
181-
# - ./scripts/ci/after-script.sh
182-
# - ./scripts/publish/publish-build-artifacts.sh
183-
# - node tools/analytics/build-analytics success ci after_script
184-
# - tools/analytics/build-analytics $TRAVIS_TEST_RESULT ci job
185-
#
186-
#notifications:
187-
# webhooks:
188-
# urls:
189-
# - https://webhooks.gitter.im/e/1ef62e23078036f9cee4
190-
# # trigger Buildtime Trend Service to parse Travis CI log
191-
# - https://buildtimetrend.herokuapp.com/travis
192-
# - http://104.197.9.155:8484/hubot/travis/activity
193-
# on_success: always # options: [always|never|change] default: always
194-
# on_failure: always # options: [always|never|change] default: always
195-
# on_start: never # default: never
196-
# slack:
197-
# secure: EP4MzZ8JMyNQJ4S3cd5LEPWSMjC7ZRdzt3veelDiOeorJ6GwZfCDHncR+4BahDzQAuqyE/yNpZqaLbwRWloDi15qIUsm09vgl/1IyNky1Sqc6lEknhzIXpWSalo4/T9ZP8w870EoDvM/UO+LCV99R3wS8Nm9o99eLoWVb2HIUu0=

tools/check-environment.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
var exec = require('child_process').exec;
1313
var checkNodeModules;
1414
var semver;
15-
16-
1715
var issues = [];
1816

1917
// coarse Node version check
20-
if (Number.parseInt(process.version[1], 10) < 5) {
21-
issues.push("Angular 2 build currently requires Node 5. Use nvm to update your node version.");
18+
if (+process.version[1] < 5) {
19+
issues.push("Angular 2 build currently requires Node 5+. Use nvm to update your node version.");
2220
}
2321

2422
try {
@@ -46,7 +44,6 @@ try {
4644
printWarning(issues);
4745
}
4846

49-
5047
function checkEnvironment(reqs) {
5148

5249
exec('npm --version', function(e, stdout) {
@@ -77,10 +74,10 @@ function printWarning(issues) {
7774
if (!issues.length) return;
7875

7976
console.warn('');
80-
console.warn(Array(110).join('!'));
77+
console.warn('!'.repeat(110));
8178
console.warn('!!! Your environment is not in a good shape. Following issues were found:');
8279
issues.forEach(function(issue) {console.warn('!!! - ' + issue);});
83-
console.warn(Array(110).join('!'));
80+
console.warn('!'.repeat(110));
8481
console.warn('');
8582

8683
if (process.env.CI) {

0 commit comments

Comments
 (0)