From 2f89787b7aa50c94ac5ea38d51efe5bb9541651b Mon Sep 17 00:00:00 2001 From: maurizio vitale Date: Tue, 18 Feb 2020 13:32:51 +0000 Subject: [PATCH] Use the build dist without stats and move the docker step on top --- .travis.yml | 6 +++--- package.json | 3 ++- .../{core-extension-demo.sh => core-extension.sh} | 8 -------- 3 files changed, 5 insertions(+), 12 deletions(-) rename scripts/travis/unit-test/{core-extension-demo.sh => core-extension.sh} (73%) diff --git a/.travis.yml b/.travis.yml index 0ae0ba3328..36a6dcab1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,12 @@ stages: if: type = pull_request OR type = api - name: Lint & Build Dist & Release if: (type = push OR type = cron) AND tag IS blank + - name: Update Rancher + if: (type = push AND tag IS blank) OR type = api - name: Check bundle if: type = push AND tag IS blank - name: Unit test if: (type != cron AND tag IS blank) OR type = api - - name: Update Rancher - if: (type = push AND tag IS blank) OR type = api - name: e2e Test if: (type != cron AND tag IS blank) OR type = api - name: Update Children Projects @@ -76,7 +76,7 @@ jobs: script: ./scripts/travis/unit-test/content.sh - stage: Unit test name: Unit test core extension demo - script: ./scripts/travis/unit-test/core-extension-demo.sh + script: ./scripts/travis/unit-test/core-extension.sh - stage: Unit test name: Unit test process process-cloud insights script: ./scripts/travis/unit-test/process.sh diff --git a/package.json b/package.json index 499af07e43..c9c29443e5 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,8 @@ "start:dist": "ng lint dist && npm run validate-config && ng serve dist --prod --open", "build": "npm run validate-config && ng build dist", "build:dev": "npm run validate-config && npm run style:dev && ng build dev", - "build:dist": "npm run validate-config && node --max-old-space-size=12000 node_modules/@angular/cli/bin/ng build dist --prod --stats-json ", + "build:dist": "npm run validate-config && node --max-old-space-size=12000 node_modules/@angular/cli/bin/ng build dist --prod", + "build:dist:stats": "npm run validate-config && node --max-old-space-size=12000 node_modules/@angular/cli/bin/ng build dist --prod --stats-json", "build:dist:e2e": "npm run validate-config && node --max-old-space-size=12000 node_modules/@angular/cli/bin/ng build dist --prod --configuration=e2e --stats-json ", "style:dev": "npm run webpack -- --config ./lib/config/webpack.style.js --progress --profile --bail", "test": "npm run validate-config && ng test dev --watch=false", diff --git a/scripts/travis/unit-test/core-extension-demo.sh b/scripts/travis/unit-test/core-extension.sh similarity index 73% rename from scripts/travis/unit-test/core-extension-demo.sh rename to scripts/travis/unit-test/core-extension.sh index ff2d4b9e01..01d7ae6c3b 100755 --- a/scripts/travis/unit-test/core-extension-demo.sh +++ b/scripts/travis/unit-test/core-extension.sh @@ -20,12 +20,4 @@ then ng test extensions --watch=false || exit 1; fi; -echo "================== demo unit ===================" - -if ([ "$TRAVIS_BRANCH" = "master" ]); then - (./scripts/start.sh -t -ss -si || exit 1;); -else - (./scripts/start.sh -dev -t -ss -si || exit 1;); -fi; - bash <(curl -s https://codecov.io/bash) -X gcov