Skip to content

Commit 54cfb7a

Browse files
authored
Merge pull request #2797 from angular-fullstack/ci-fix
Fix CI
2 parents 43b24b3 + a4852fa commit 54cfb7a

File tree

4 files changed

+216
-27
lines changed

4 files changed

+216
-27
lines changed

circle.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: node:10
5+
- image: circleci/node:10-browsers
66
- image: mongo
77
command: mongod
88

@@ -19,17 +19,6 @@ jobs:
1919
- checkout
2020
- run: git submodule sync && git submodule update --init
2121

22-
# Global npm dependencies
23-
- restore_cache:
24-
keys:
25-
- generator-angular-fullstack-npm-global-{{ .Branch }}
26-
- generator-angular-fullstack-npm-global-
27-
- run: npm install --global gulp-cli
28-
- save_cache:
29-
key: generator-angular-fullstack-npm-global-{{ .Branch }}
30-
paths:
31-
- /usr/local/lib/node_modules
32-
3322
# Generator npm dependencies
3423
- restore_cache:
3524
keys:
@@ -43,19 +32,19 @@ jobs:
4332
- ~/generator-angular-fullstack/node_modules
4433

4534
# Test fixtures
46-
- run: gulp updateFixtures:test
35+
- run: npx gulp updateFixtures:test
4736
- restore_cache:
4837
keys:
4938
- generator-angular-fullstack-npm-fixtures-{{ .Branch }}-{{ checksum "templates/app/_package.json" }}
5039
- generator-angular-fullstack-npm-fixtures-{{ .Branch }}
5140
- generator-angular-fullstack-npm-fixtures-
52-
- run: gulp installFixtures
41+
- run: npx gulp installFixtures
5342
- save_cache:
5443
key: generator-angular-fullstack-npm-fixtures-{{ .Branch }}-{{ checksum "templates/app/_package.json" }}
5544
paths:
5645
- ~/generator-angular-fullstack/test/fixtures/node_modules
5746

58-
- run: gulp build
47+
- run: npx gulp build
5948
- run: npm test
6049

6150
- deploy:

package-lock.json

Lines changed: 210 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)