Skip to content

Commit a66cdb4

Browse files
IgorMinarmhevery
IgorMinar
authored and
mhevery
committed
repackaging: all the repackaging changes squashed
1 parent 505da6c commit a66cdb4

File tree

860 files changed

+7876
-4992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

860 files changed

+7876
-4992
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ npm-debug.log
5252

5353
# built dart payload tests
5454
/modules_dart/payload/**/build
55+
56+
# rollup-test output
57+
/modules/rollup-test/dist/

‎.travis.yml

+165-107
Original file line numberDiff line numberDiff line change
@@ -3,132 +3,190 @@ sudo: false
33
node_js:
44
- '5.4.1'
55

6+
addons:
7+
# firefox: "38.0"
8+
apt:
9+
sources:
10+
# needed to install g++ that is used by npms's native modules
11+
- ubuntu-toolchain-r-test
12+
packages:
13+
- g++-4.8
14+
615
branches:
716
except:
817
- g3_v2_0
918

1019
cache:
1120
directories:
12-
- $HOME/.pub-cache
13-
- $HOME/.chrome/chromium
21+
- ./node_modules
22+
- ./.chrome/chromium
23+
# - $HOME/.pub-cache
1424

15-
before_cache:
16-
# Undo the pollution of the typescript_next build before the cache is primed for future use
17-
- if [[ "$MODE" == "typescript_next" ]]; then npm install typescript; fi
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
1829

1930
env:
2031
global:
21-
# Use newer verison of GCC to that is required to compile native npm modules for Node v4+ on Ubuntu Precise
22-
# more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
23-
- CXX=g++-4.8
24-
- KARMA_DART_BROWSERS=DartiumWithWebPlatform
25-
# 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
26-
- KARMA_JS_BROWSERS=ChromeNoSandbox
27-
- E2E_BROWSERS=ChromeOnTravis
28-
- LOGS_DIR=/tmp/angular-build/logs
29-
- SAUCE_USERNAME=angular-ci
30-
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
31-
- BROWSER_STACK_USERNAME=angularteam1
32-
- BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
33-
- ARCH=linux-x64
34-
- DART_DEV_VERSION=latest
35-
- DART_STABLE_VERSION=latest
36-
- DART_CHANNEL=stable
37-
- DART_VERSION=$DART_STABLE_VERSION
38-
# Token for tsd to increase github rate limit
39-
# See https://github.com/DefinitelyTyped/tsd#tsdrc
40-
# This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
41-
# because those are not visible for pull requests, and those should also be reliable.
42-
# This SSO token belongs to github account angular-github-ratelimit-token which has no access
43-
# (password is in Valentine)
44-
- TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
45-
# GITHUB_TOKEN_ANGULAR
46-
- secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
32+
# - KARMA_JS_BROWSERS=ChromeNoSandbox
33+
# - E2E_BROWSERS=ChromeOnTravis
34+
# - LOGS_DIR=/tmp/angular-build/logs
35+
# - ARCH=linux-x64
36+
4737
matrix:
4838
# Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
49-
- MODE=dart
50-
- MODE=dart DART_CHANNEL=dev
51-
- MODE=saucelabs_required
52-
- MODE=browserstack_required
53-
- MODE=saucelabs_optional
54-
- MODE=browserstack_optional
55-
- MODE=dart_ddc
56-
- MODE=js
57-
- MODE=router
58-
- MODE=build_only
59-
- MODE=typescript_next
60-
- MODE=lint
61-
62-
matrix:
63-
allow_failures:
64-
- env: "MODE=saucelabs_optional"
65-
- env: "MODE=browserstack_optional"
39+
- CI_MODE=js
40+
# - CI_MODE=dart
41+
- CI_MODE=build_only
42+
- CI_MODE=saucelabs_required
43+
- CI_MODE=browserstack_required
6644

67-
addons:
68-
firefox: "38.0"
69-
apt:
70-
sources:
71-
- ubuntu-toolchain-r-test
72-
packages:
73-
- g++-4.8
45+
#matrix:
46+
# allow_failures:
47+
# - env: "MODE=saucelabs_optional"
48+
# - env: "MODE=browserstack_optional"
7449

75-
before_install:
76-
- node tools/analytics/build-analytics start ci job
77-
- node tools/analytics/build-analytics start ci before_install
78-
- echo ${TSDRC} > .tsdrc
79-
- export CHROME_BIN=$HOME/.chrome/chromium/chrome-linux/chrome
80-
- export DISPLAY=:99.0
81-
- export GIT_SHA=$(git rev-parse HEAD)
82-
- ./scripts/ci/init_android.sh
83-
- sh -e /etc/init.d/xvfb start
84-
# Use a separate SauseLabs account for upstream/master builds in order for Sauce to create a badge representing the status of just upstream/master
85-
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true'
86-
- node tools/analytics/build-analytics success ci before_install
8750

8851
install:
89-
- node tools/analytics/build-analytics start ci install
90-
# Install version of npm that we are locked against
91-
- npm install -g npm@3.5.3
92-
# Install version of Chromium that we are locked against
93-
- ./scripts/ci/install_chromium.sh
94-
# Install version of Dart based on the matrix build variables
95-
- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH}
96-
# Print the size of caches to ease debugging
97-
- du -sh ./node_modules || true
98-
# Install npm dependecies
99-
# check-node-modules will exit(1) if we don't need to install
100-
# we need to manually kick off the postinstall script if check-node-modules exit(0)s
101-
- node tools/npm/check-node-modules --purge && npm install || npm run postinstall
102-
- node tools/analytics/build-analytics success ci install
52+
- ./scripts/ci-lite/install.sh
10353

10454
before_script:
105-
- node tools/analytics/build-analytics start ci before_script
106-
- mkdir -p $LOGS_DIR
107-
- ./scripts/ci/presubmit-queue-setup.sh
108-
- node tools/analytics/build-analytics success ci before_script
55+
10956

11057
script:
111-
- node tools/analytics/build-analytics start ci script
112-
- ./scripts/ci/build_and_test.sh ${MODE}
113-
- node tools/analytics/build-analytics success ci script
58+
- ./scripts/ci-lite/build.sh && ./scripts/ci-lite/test.sh
11459

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

‎browser-providers.conf.js

+3-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var customLaunchers = {
3838
'SL_CHROME': {
3939
base: 'SauceLabs',
4040
browserName: 'chrome',
41-
version: '46'
41+
version: '50'
4242
},
4343
'SL_CHROMEBETA': {
4444
base: 'SauceLabs',
@@ -53,7 +53,7 @@ var customLaunchers = {
5353
'SL_FIREFOX': {
5454
base: 'SauceLabs',
5555
browserName: 'firefox',
56-
version: '42'
56+
version: '45'
5757
},
5858
'SL_FIREFOXBETA': {
5959
base: 'SauceLabs',
@@ -299,12 +299,7 @@ module.exports = {
299299
customLaunchers: customLaunchers,
300300
sauceAliases: sauceAliases,
301301
browserstackAliases: browserstackAliases
302-
}
303-
304-
if (process.env.TRAVIS) {
305-
process.env.SAUCE_ACCESS_KEY = process.env.SAUCE_ACCESS_KEY.split('').reverse().join('');
306-
process.env.BROWSER_STACK_ACCESS_KEY = process.env.BROWSER_STACK_ACCESS_KEY.split('').reverse().join('');
307-
}
302+
};
308303

309304
function buildConfiguration(type, target, required) {
310305
return Object.keys(CIconfiguration)

0 commit comments

Comments
 (0)