Skip to content

Commit 3a20fc8

Browse files
authored
Merge pull request #209 from pharindoko/dev
merge Dev
2 parents 3692531 + ab4c941 commit 3a20fc8

File tree

8 files changed

+10785
-87
lines changed

8 files changed

+10785
-87
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ install:
1515
- make install
1616
jobs:
1717
include:
18-
- stage: build-server
19-
before_script: cd packages/server
20-
script:
18+
- script:
2119
- npm run build
22-
- stage: build-cli
23-
before_script: cd packages/cli
24-
script:
20+
before_script: cd packages/server
21+
name: build-server
22+
- script:
2523
- npm run build
2624
- bin/run --version
27-
- stage: test-server
28-
before_script: cd packages/server
29-
script:
25+
before_script: cd packages/cli
26+
name: build-cli
27+
- script:
3028
- npm run test
3129
- npx snyk test
30+
before_script: cd packages/server
31+
name: test-server
3232
- stage: release
3333
if: (type = push AND branch = master)
3434
before_script:

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"express-swagger-generator": "1.1.15",
4242
"gts": "1.1.2",
4343
"jest": "24.9.0",
44-
"lerna": "^3.18.3",
44+
"lerna": "3.20.1",
4545
"node-env-webpack-plugin": "1.1.0",
4646
"nodemon": "2.0.2",
4747
"nodemon-webpack-plugin": "4.2.2",

0 commit comments

Comments
 (0)