Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 10:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: use Angular 6 project with CLI using fixed RxJs

Browse Source
This commit is contained in:
Filipe Silva 2018-03-27 13:08:25 +01:00
parent 46946e6afe
commit 7e09cca5fb
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -15,7 +15,7 @@ test_script:
- npm --version - npm --version
- npm run test:packages - npm run test:packages
- npm run test:cli - npm run test:cli
- node tests\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**" - node tests\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**" --ng-version="6.0.0-rc.0"
build: off build: off

8
.travis.yml
View File

@ -36,19 +36,19 @@ matrix:
env: test env: test
- node_js: "8" - node_js: "8"
os: linux os: linux
script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent --ng-version="6.0.0-rc.0"
env: e2e-0 env: e2e-0
- node_js: "8" - node_js: "8"
os: linux os: linux
script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent --ng-version="6.0.0-rc.0"
env: e2e-1 env: e2e-1
- node_js: "8" - node_js: "8"
os: linux os: linux
script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent --ng-version="6.0.0-rc.0"
env: e2e-2 env: e2e-2
- node_js: "8" - node_js: "8"
os: linux os: linux
script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent --ng-version="6.0.0-rc.0"
env: e2e-3 env: e2e-3
- node_js: "8" - node_js: "8"
os: linux os: linux

2
package.json
View File

@ -57,7 +57,7 @@
"node-modules-path": "^1.0.0", "node-modules-path": "^1.0.0",
"opn": "~5.1.0", "opn": "~5.1.0",
"resolve": "^1.1.7", "resolve": "^1.1.7",
"rxjs": "^5.5.6", "rxjs": "^5.5.8",
"semver": "^5.3.0", "semver": "^5.3.0",
"silent-error": "^1.0.0", "silent-error": "^1.0.0",
"typescript": "~2.6.2", "typescript": "~2.6.2",

2
packages/@angular/cli/package.json
View File

@ -44,7 +44,7 @@
"node-modules-path": "^1.0.0", "node-modules-path": "^1.0.0",
"opn": "~5.1.0", "opn": "~5.1.0",
"resolve": "^1.1.7", "resolve": "^1.1.7",
"rxjs": "^5.5.6", "rxjs": "^5.5.8",
"semver": "^5.1.0", "semver": "^5.1.0",
"silent-error": "^1.0.0", "silent-error": "^1.0.0",
"yargs-parser": "^9.0.2" "yargs-parser": "^9.0.2"

2
tests/e2e/utils/project.ts
View File

@ -159,7 +159,7 @@ export function useNgVersion(version: string) {
json['devDependencies']['typescript'] = '~2.5.0'; json['devDependencies']['typescript'] = '~2.5.0';
} else { } else {
json['devDependencies']['typescript'] = '~2.7.0'; json['devDependencies']['typescript'] = '~2.7.0';
json['dependencies']['rxjs'] = '6.0.0-beta.0'; json['dependencies']['rxjs'] = '6.0.0-beta.3';
} }
}); });
} }