diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-12-17 11:04:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-17 11:04:51 +0000 |
| commit | fca7e153ab6577914032e100ffff3dfa6392c306 (patch) | |
| tree | 19e347e24294d2170715f082e3999fe285d524a9 | |
| parent | e2801985291583854dcedcad69c858c81c64d3de (diff) | |
| parent | 26c84f23f0db086bfb5ef71c72e49799a9d32cbc (diff) | |
Merge "default maven build of vid-webpack-master to run build and unit tests"
| -rw-r--r-- | vid-webpack-master/package.json | 1 | ||||
| -rw-r--r-- | vid-webpack-master/pom.xml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/vid-webpack-master/package.json b/vid-webpack-master/package.json index c9113d681..ee04de10d 100644 --- a/vid-webpack-master/package.json +++ b/vid-webpack-master/package.json @@ -8,6 +8,7 @@ "build": "ng build --no-progress --no-aot --output-hashing all", "build.prod": "ng build", "test": "jest", + "ci": "npm run test && npm run build", "test:jest": "jest", "test:jest:pipeline": "jest --silent --ci --reporters=default --reporters=jest-junit", "test:jest:watch": "jest --watch", diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml index 2fe0a6eaf..f84a485eb 100644 --- a/vid-webpack-master/pom.xml +++ b/vid-webpack-master/pom.xml @@ -28,7 +28,7 @@ <stagingNexusPath>content/repositories/staging/</stagingNexusPath> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> - <NPM_CMD>build</NPM_CMD> + <NPM_CMD>ci</NPM_CMD> </properties> @@ -70,6 +70,7 @@ </distributionManagement> <profiles> + <profile> <id>if-not-webpack</id> <activation> @@ -107,6 +108,7 @@ </plugins> </build> </profile> + <profile> <id>webpack-npm</id> <activation> |