From 8ee048f68ec0e9425a30fc04a506b34a1b97179b Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (pragmatismo.io)" Date: Sun, 18 Nov 2018 21:28:26 -0200 Subject: [PATCH] fix(CI): Migrating CI logic to package.json. --- .npmignore | 2 +- .travis.yml | 8 -------- package-lock.json | 9 +++------ package.json | 6 ++++-- packages/default.gbui/package-lock.json | 13 +++++++++---- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.npmignore b/.npmignore index 2e154f7f..71da632c 100644 --- a/.npmignore +++ b/.npmignore @@ -2,7 +2,7 @@ .coveralls.yml .env .npmrc -.nyc_output +# WILLSHIP .nyc_output coverage # WILLSHIP dist guaribas.log diff --git a/.travis.yml b/.travis.yml index 7dedc2fa..45ef9de6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,11 @@ node_js: notifications: email: false - -before_install: -- npm install --global nyc mocha shx -install: -- npm install - before_script: - npm run build script: -- npm run build-docs - npm run coveralls branches: @@ -28,7 +21,6 @@ branches: after_success: - npm run travis-deploy-once "npm run semantic-release" -- npm run typedoc - npm pack deploy: diff --git a/package-lock.json b/package-lock.json index bee55876..e5be208f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.0.0", + "version": "1.0.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5926,8 +5926,7 @@ "es6-object-assign": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", - "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=", - "dev": true + "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=" }, "es6-promise": { "version": "4.2.5", @@ -16883,7 +16882,6 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.2.tgz", "integrity": "sha512-aS0mWtW3T2sHAenrSrip2XGv39O9dXIFUqxAEWHEOS1ePtGIBavdPJY1kE2IHl14V/4iCbUiNDPGdyYTtmhSoA==", - "dev": true, "requires": { "es6-object-assign": "^1.0.3", "minimist": "^1.2.0", @@ -16893,8 +16891,7 @@ "minimist": { "version": "1.2.0", "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } }, diff --git a/package.json b/package.json index e230682d..d3d6d03b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,9 @@ "scripts": { "clean": "shx rm -rf node_modules/ dist/ docs/reference", "tslint": "tslint --fix ./src/*.ts ./packages/**/*.ts -t verbose", - "build": "tsc", + "build": "npm install && npm run build-server && npm run build-gbui && npm run build-docs", + "build-server": "tsc", + "build-gbui": "cd packages/default.gbui && npm install && npm run build", "build-docs": "typedoc --options typedoc.json src/", "test": "nyc --reporter=html --reporter=text mocha -r ts-node/register packages/**/*.test.ts ", "pretest": "npm run build", @@ -93,6 +95,7 @@ "scanf": "^1.0.2", "sequelize": "4.41.2", "sequelize-typescript": "0.6.6", + "shx": "^0.3.2", "simple-git": "^1.107.0", "sqlite3": "4.0.4", "strict-password-generator": "^1.1.1", @@ -134,7 +137,6 @@ "pre-git": "3.17.1", "prettier-standard": "8.0.1", "semantic-release": "^15.12.0", - "shx": "^0.3.2", "standard": "12.0.1", "travis-deploy-once": "5.0.9", "ts-loader": "^5.3.0", diff --git a/packages/default.gbui/package-lock.json b/packages/default.gbui/package-lock.json index ba307056..ec645add 100644 --- a/packages/default.gbui/package-lock.json +++ b/packages/default.gbui/package-lock.json @@ -5698,7 +5698,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6063,7 +6064,8 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -6111,6 +6113,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6149,11 +6152,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.2", - "bundled": true + "bundled": true, + "optional": true } } },