Skip to content

Commit adfe40a

Browse files
committed
wip
1 parent aeb9a1c commit adfe40a

2 files changed

Lines changed: 72 additions & 67 deletions

File tree

.travis.yml

Lines changed: 68 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -15,76 +15,80 @@ matrix:
1515
- node_js: "7"
1616
- node_js: "8"
1717
include:
18-
- stage: build
19-
script: npm run lint
20-
env: lint
21-
- script: npm run build
22-
env: build
18+
# - stage: build
19+
# script: npm run lint
20+
# env: lint
21+
# - script: npm run build
22+
# env: build
2323

2424
- stage: test
25-
script: npm run test
25+
script: node tests/run_e2e.js "--glob=tests/commands/new/new-minimal.ts*"
2626
env: test
27-
- node_js: "6"
28-
os: linux
29-
script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
27+
28+
# - stage: test
29+
# script: npm run test
30+
# env: test
31+
# - node_js: "6"
32+
# os: linux
33+
# script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
3034
env: e2e-0
31-
- node_js: "6"
32-
os: linux
33-
script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
34-
env: e2e-1
35-
- node_js: "6"
36-
os: linux
37-
script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
38-
env: e2e-2
39-
- node_js: "6"
40-
os: linux
41-
script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
42-
env: e2e-3
43-
- node_js: "6"
44-
os: linux
45-
script: node tests/run_e2e.js --eject "--glob=tests/build/**"
46-
env: eject
35+
# - node_js: "6"
36+
# os: linux
37+
# script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
38+
# env: e2e-1
39+
# - node_js: "6"
40+
# os: linux
41+
# script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
42+
# env: e2e-2
43+
# - node_js: "6"
44+
# os: linux
45+
# script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
46+
# env: e2e-3
47+
# - node_js: "6"
48+
# os: linux
49+
# script: node tests/run_e2e.js --eject "--glob=tests/build/**"
50+
# env: eject
4751

48-
# Optional builds.
49-
- node_js: "6"
50-
os: linux
51-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
52-
script: node tests/run_e2e.js --ng2 "--glob=tests/{build,test,misc}/**"
53-
env: ng2
54-
- node_js: "6"
55-
os: linux
56-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
57-
script: node tests/run_e2e.js "--nightly --glob=tests/{build,test,misc}/**"
58-
env: nightly
59-
- node_js: "7"
60-
os: linux
61-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
62-
script: node tests/run_e2e.js "--glob=tests/{build,test,misc}/**"
63-
env: node7
64-
- node_js: "8"
65-
os: linux
66-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
67-
script: node tests/run_e2e.js "--glob=tests/build/**"
68-
env: node8
52+
# # Optional builds.
53+
# - node_js: "6"
54+
# os: linux
55+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
56+
# script: node tests/run_e2e.js --ng2 "--glob=tests/{build,test,misc}/**"
57+
# env: ng2
58+
# - node_js: "6"
59+
# os: linux
60+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
61+
# script: node tests/run_e2e.js "--nightly --glob=tests/{build,test,misc}/**"
62+
# env: nightly
63+
# - node_js: "7"
64+
# os: linux
65+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
66+
# script: node tests/run_e2e.js "--glob=tests/{build,test,misc}/**"
67+
# env: node7
68+
# - node_js: "8"
69+
# os: linux
70+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
71+
# script: node tests/run_e2e.js "--glob=tests/build/**"
72+
# env: node8
6973

70-
- stage: deploy
71-
script: skip
72-
env: builds
73-
deploy:
74-
- provider: script
75-
script: node scripts/git-builds.js
76-
skip_cleanup: true
77-
on:
78-
all_branches: true
79-
- stage: deploy
80-
script: skip
81-
env: publish
82-
deploy:
83-
- provider: script
84-
script: node scripts/publish/publish.js
85-
skip_cleanup: true
86-
on:
87-
tags: true
74+
# - stage: deploy
75+
# script: skip
76+
# env: builds
77+
# deploy:
78+
# - provider: script
79+
# script: node scripts/git-builds.js
80+
# skip_cleanup: true
81+
# on:
82+
# all_branches: true
83+
# - stage: deploy
84+
# script: skip
85+
# env: publish
86+
# deploy:
87+
# - provider: script
88+
# script: node scripts/publish/publish.js
89+
# skip_cleanup: true
90+
# on:
91+
# tags: true
8892

8993

9094
before_install:

tests/e2e/utils/project.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import {readFile, writeFile} from './fs';
2-
import {execAndWaitForOutputToMatch, silentNpm, ng} from './process';
2+
import { execAndWaitForOutputToMatch, silentNpm, npm, ng} from './process';
33
import {getGlobalVariable} from './env';
44

55
const packages = require('../../../lib/packages').packages;
6+
console.log(packages)
67

78

89
const tsConfigPath = 'src/tsconfig.app.json';
@@ -40,7 +41,7 @@ export function createProject(name: string, ...args: string[]) {
4041
.then(() => process.chdir(name))
4142
.then(() => updateJsonFile('package.json', json => {
4243
Object.keys(packages).forEach(pkgName => {
43-
json['dependencies'][pkgName] = packages[pkgName].dist;
44+
json['dependencies'][pkgName] = packages[pkgName].tar;
4445
});
4546
}))
4647
.then(() => argv['ng2'] ? useNg2() : Promise.resolve())
@@ -74,7 +75,7 @@ export function createProject(name: string, ...args: string[]) {
7475
}
7576
})
7677
.then(() => console.log(`Project ${name} created... Installing npm.`))
77-
.then(() => silentNpm('install'));
78+
.then(() => npm('install'));
7879
}
7980

8081
// Convert a Angular 4 project to Angular 2.

0 commit comments

Comments
 (0)