refactor: update paths from modules/@angular to packages
This commit is contained in:
@ -22,17 +22,17 @@ travisFoldEnd "tsc tools"
|
||||
|
||||
|
||||
travisFoldStart "tsc all"
|
||||
node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main -p modules
|
||||
node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main -p packages
|
||||
travisFoldEnd "tsc all"
|
||||
|
||||
|
||||
# TODO(i): what are these compilations here for?
|
||||
travisFoldStart "tsc a bunch of useless stuff"
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/core/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/common/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/platform-browser/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/router/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/forms/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p packages/core/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p packages/common/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p packages/platform-browser/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p packages/router/tsconfig-build.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p packages/forms/tsconfig-build.json
|
||||
travisFoldEnd "tsc a bunch of useless stuff"
|
||||
|
||||
|
||||
|
@ -2,6 +2,9 @@
|
||||
|
||||
set -u -e -o pipefail
|
||||
|
||||
TRAVIS=${TRAVIS:-}
|
||||
CI_MODE=${CI_MODE:-}
|
||||
|
||||
# Setup environment
|
||||
readonly thisDir=$(cd $(dirname $0); pwd)
|
||||
source ${thisDir}/_travis-fold.sh
|
||||
|
@ -23,7 +23,7 @@ PKGS=(
|
||||
TMPDIR=${TMPDIR:-.}
|
||||
readonly TMP=$TMPDIR/e2e_test.$(date +%s)
|
||||
mkdir -p $TMP
|
||||
cp -R -v modules/@angular/compiler-cli/integrationtest/* $TMP
|
||||
cp -R -v packages/compiler-cli/integrationtest/* $TMP
|
||||
cp -R -v modules/benchmarks $TMP
|
||||
# Try to use the same versions as angular, in particular, this will
|
||||
# cause us to install the same rxjs version.
|
||||
|
@ -12,7 +12,7 @@ travisFoldStart "test.e2e.buildPackages"
|
||||
travisFoldEnd "test.e2e.buildPackages"
|
||||
|
||||
|
||||
if [[ ${TRAVIS} ]]; then
|
||||
if [[ ${TRAVIS:-} ]]; then
|
||||
travisFoldStart "test.e2e.xvfb-start"
|
||||
sh -e /etc/init.d/xvfb start
|
||||
travisFoldEnd "test.e2e.xvfb-start"
|
||||
|
@ -30,7 +30,7 @@ travisFoldEnd "test.unit.node"
|
||||
# rebuild to revert files in @angular/compiler/test
|
||||
# TODO(tbosch): remove this and teach karma to serve the right files
|
||||
travisFoldStart "test.unit.rebuildHack"
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p modules/tsconfig.json
|
||||
node dist/tools/@angular/tsc-wrapped/src/main -p packages/tsconfig.json
|
||||
travisFoldStart "test.unit.rebuildHack"
|
||||
|
||||
|
||||
@ -47,5 +47,5 @@ travisFoldEnd "test.unit.localChrome"
|
||||
|
||||
|
||||
travisFoldStart "test.unit.localChrome.router"
|
||||
$(npm bin)/karma start ./modules/@angular/router/karma.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
|
||||
$(npm bin)/karma start ./packages/router/karma.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
|
||||
travisFoldEnd "test.unit.localChrome.router"
|
||||
|
Reference in New Issue
Block a user