Skip to content

Commit 67f17e2

Browse files
authored
Merge pull request #8743 from IgniteUI/zkolev/code-coverage-gh-actions-102x
Code coverage with gh actions - 10.2.x
2 parents c26c59f + 9a6e112 commit 67f17e2

File tree

3 files changed

+29
-15
lines changed

3 files changed

+29
-15
lines changed

.github/workflows/nodejs.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
branches: [ master, '[0-9]+.[0-9]+.x' ]
1111

1212
jobs:
13-
build:
13+
run-tests:
1414

1515
runs-on: ubuntu-latest
1616

@@ -19,11 +19,10 @@ jobs:
1919
node-version: [10.x, 12.x, 14.x]
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- name: Checkout
23+
uses: actions/checkout@v2
2324
- name: Use Node.js ${{ matrix.node-version }}
2425
uses: actions/setup-node@v1
25-
with:
26-
node-version: ${{ matrix.node-version }}
2726
- run: npm ci
2827
- run: npm run lint:lib
2928
- run: npm run build:lib
@@ -40,3 +39,16 @@ jobs:
4039
env:
4140
NODE_OPTIONS: --max_old_space_size=4096
4241
- run: npm run test:schematics
42+
- name: Install coverage combiner
43+
if: github.repository == 'IgniteUI/igniteui-angular' && matrix.node-version == '14.x'
44+
run: sudo npm install -g istanbul-combine
45+
- name: Combine scripts
46+
if: github.repository == 'IgniteUI/igniteui-angular' && matrix.node-version == '14.x'
47+
run: 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
48+
- name: Publish to coveralls.io
49+
if: github.repository == 'IgniteUI/igniteui-angular' && matrix.node-version == '14.x'
50+
uses: coverallsapp/[email protected]
51+
with:
52+
github-token: ${{ github.token }}
53+
54+

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ script:
2424
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:grid; fi
2525
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:tgrid; fi
2626
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:hgrid; fi
27-
- 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
2827
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi
29-
- if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
28+
## Use only Github actions for publishing coveralls.io status
29+
#- 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
30+
# - if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
3031

3132
# before_deploy:
3233
# - npm run build:schematics

azure-pipelines.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,17 @@ steps:
3838
env:
3939
NODE_OPTIONS: "--max_old_space_size=4096"
4040

41-
- 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
42-
displayName: 'Combine coverage results'
43-
env:
44-
AZURE_PIPELINES: "true"
41+
## Use only Github actions for publishing coveralls.io status
42+
# - 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
43+
# displayName: 'Combine coverage results'
44+
# env:
45+
# AZURE_PIPELINES: "true"
4546

46-
- script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
47-
condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular'))
48-
displayName: 'Code coverage @ Coveralls'
49-
env:
50-
COVERALLS_REPO_TOKEN: $(coveralls.repoToken)
47+
# - script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
48+
# condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular'))
49+
# displayName: 'Code coverage @ Coveralls'
50+
# env:
51+
# COVERALLS_REPO_TOKEN: $(coveralls.repoToken)
5152

5253
- script: npm run test:schematics
5354
displayName: 'Run migrations & schematics'

0 commit comments

Comments
 (0)