Skip to content

Commit a7e9bc9

Browse files
committed
ci(typescript): add typescript_next build
Install typescript@next before build.js and test.typings. Restore the regular version before travis caches node_modules/. Fixes angular#6368
1 parent 265703b commit a7e9bc9

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ cache:
1212
- node_modules
1313
- $HOME/.pub-cache
1414

15+
before_cache:
16+
# Undo the pollution of the typescript_next build
17+
- npm install typescript
18+
1519
env:
1620
global:
1721
- KARMA_BROWSERS=DartiumWithWebPlatform
@@ -46,6 +50,7 @@ env:
4650
- MODE=js DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
4751
- MODE=router DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
4852
- MODE=build_only DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
53+
- MODE=typescript_next DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
4954
- MODE=lint DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
5055
- MODE=payload DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
5156

@@ -55,6 +60,8 @@ matrix:
5560
- env: "MODE=browserstack_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
5661
# TODO(alxhub): remove when dartdoc #1039 is in dev channel
5762
- env: "MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
63+
# Tracked in https://github.com/angular/angular/issues/7050
64+
- env: "MODE=typescript_next DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION"
5865

5966
addons:
6067
firefox: "38.0"

modules/playground/src/web_workers/images/services/bitmap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class BitmapService {
6363
return imageData;
6464
}
6565

66-
private _swap(data: any[], index1: number, index2: number) {
66+
private _swap(data: Uint8Array | number[], index1: number, index2: number) {
6767
var temp = data[index1];
6868
data[index1] = data[index2];
6969
data[index2] = temp;

scripts/ci/build_and_test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ elif [ "$MODE" = "lint" ]; then
1919
elif [ "$MODE" = "build_only" ]; then
2020
${SCRIPT_DIR}/build_js.sh
2121
${SCRIPT_DIR}/build_dart.sh
22+
elif [ "$MODE" = "typescript_next" ]; then
23+
# Ignore complaints about unsatisfied peer deps
24+
npm install typescript@next || true
25+
${SCRIPT_DIR}/build_js.sh
26+
./node_modules/.bin/gulp test.typings
2227
elif [ "$MODE" = "payload" ]; then
2328
source ${SCRIPT_DIR}/env_dart.sh
2429
./node_modules/.bin/gulp test.payload.dart/ci

scripts/ci/build_dart_ddc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cd $SCRIPT_DIR/../..
1212

1313
# Variables
1414
DDC_TOTAL_WARNING_CAP="1000"
15-
DDC_TOTAL_ERROR_CAP="6"
15+
DDC_TOTAL_ERROR_CAP="11"
1616
DDC_DIR=`pwd`/tmp/dev_compiler
1717
DDC_VERSION="0.1.14"
1818

0 commit comments

Comments
 (0)