Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@ before_script:
# more heap mem per https://github.com/angular/angular-cli/issues/12645, https://github.com/npm/npm/issues/12238#issuecomment-367147962
- export NODE_OPTIONS="--max_old_space_size=4096"
- npm install -g gulp
- npm install -g istanbul-combine
script:
- npm run lint:lib
- ng build igniteui-angular --prod
- npm run build:style
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:others; fi
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:grid; fi
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:tgrid; fi
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:hgrid; fi
- if [ -z "${TRAVIS_TAG}" ]; then istanbul-combine -d coverage -p none -r lcov -r html coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json; fi
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib; fi
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi
- if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi

Expand Down
27 changes: 1 addition & 26 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,17 @@ steps:
env:
AZURE_PIPELINES: "true"

- script: sudo npm install -g istanbul-combine
displayName: 'Install coverage combiner'
env:
AZURE_PIPELINES: "true"

- script: npm run lint:lib
displayName: 'Run lint'

- script: npm run build:lib
displayName: 'Build source code and styles'

- script: npm run test:lib:azure:others
- script: npm run test:lib:azure
displayName: 'Run non-grid tests'
env:
NODE_OPTIONS: "--max_old_space_size=4096"

- script: npm run test:lib:azure:grid
displayName: 'Run grid tests'
env:
NODE_OPTIONS: "--max_old_space_size=4096"

- script: npm run test:lib:azure:tgrid
displayName: 'Run tree grid tests'
env:
NODE_OPTIONS: "--max_old_space_size=4096"

- script: npm run test:lib:azure:hgrid
displayName: 'Run hierarchical grid tests'
env:
NODE_OPTIONS: "--max_old_space_size=4096"

- script: istanbul-combine -d coverage -p none -r lcov -r cobertura coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json
displayName: 'Combine coverage results'
env:
AZURE_PIPELINES: "true"

- script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular'))
displayName: 'Code coverage @ Coveralls'
Expand Down
9 changes: 0 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@
"e2e": "ng e2e",
"test:lib": "ng test igniteui-angular --watch=false --no-progress --code-coverage",
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.conf.js",
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
"test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
"test:lib:watch": "ng test igniteui-angular",
"test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
"build:lib": "ng build igniteui-angular --prod && gulp build-style",
Expand Down Expand Up @@ -93,7 +85,6 @@
"karma-coverage-istanbul-reporter": "~2.0.4",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "~1.4.0",
"karma-jasmine-spec-tags": "^1.1.0",
"karma-junit-reporter": "^1.2.0",
"karma-spec-reporter": "~0.0.32",
"lunr": "^2.3.5",
Expand Down
47 changes: 0 additions & 47 deletions projects/igniteui-angular/karma.azure.grid.conf.js

This file was deleted.

47 changes: 0 additions & 47 deletions projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js

This file was deleted.

47 changes: 0 additions & 47 deletions projects/igniteui-angular/karma.azure.non-grid.conf.js

This file was deleted.

47 changes: 0 additions & 47 deletions projects/igniteui-angular/karma.azure.tree-grid.conf.js

This file was deleted.

47 changes: 0 additions & 47 deletions projects/igniteui-angular/karma.grid.conf.js

This file was deleted.

47 changes: 0 additions & 47 deletions projects/igniteui-angular/karma.hierarchical-grid.conf.js

This file was deleted.

Loading