Skip to content

Commit c09e8fb

Browse files
committed
build: update gcovr to v7.2
1 parent 589b67a commit c09e8fb

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/coverage-linux-without-intl.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ jobs:
5858
- name: Environment Information
5959
run: npx envinfo
6060
- name: Install gcovr
61-
run: pip install gcovr==4.2
61+
run: pip install gcovr==7.2
6262
- name: Build
63-
run: make build-ci -j4 V=1 CONFIG_FLAGS="--error-on-warn --coverage --without-intl"
63+
run: make build-ci -j4 CONFIG_FLAGS="--error-on-warn --coverage --without-intl"
6464
# TODO(bcoe): fix the couple tests that fail with the inspector enabled.
6565
# The cause is most likely coverage's use of the inspector.
6666
- name: Test
@@ -70,7 +70,7 @@ jobs:
7070
env:
7171
NODE_OPTIONS: --max-old-space-size=8192
7272
- name: Report C++
73-
run: cd out && gcovr --gcov-exclude='.*\b(deps|usr|out|obj|cctest|embedding)\b' -v -r Release/obj.target --xml -o ../coverage/coverage-cxx.xml --root=$(cd ../ && pwd)
73+
run: gcovr --gcov-exclude='.*\b(deps|usr|out|obj|cctest|embedding)\b' -v -r out/Release/obj.target --xml -o ./coverage/coverage-cxx.xml
7474
# Clean temporary output from gcov and c8, so that it's not uploaded:
7575
- name: Clean tmp
7676
run: rm -rf coverage/tmp && rm -rf out
@@ -79,3 +79,5 @@ jobs:
7979
with:
8080
directory: ./coverage
8181
token: ${{ secrets.CODECOV_TOKEN }}
82+
verbose: true
83+
fail_ci_if_error: true

.github/workflows/coverage-linux.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ jobs:
5858
- name: Environment Information
5959
run: npx envinfo
6060
- name: Install gcovr
61-
run: pip install gcovr==4.2
61+
run: pip install gcovr==7.2
6262
- name: Build
63-
run: make build-ci -j4 V=1 CONFIG_FLAGS="--error-on-warn --coverage"
63+
run: make build-ci -j4 CONFIG_FLAGS="--error-on-warn --coverage"
6464
# TODO(bcoe): fix the couple tests that fail with the inspector enabled.
6565
# The cause is most likely coverage's use of the inspector.
6666
- name: Test
@@ -70,7 +70,7 @@ jobs:
7070
env:
7171
NODE_OPTIONS: --max-old-space-size=8192
7272
- name: Report C++
73-
run: cd out && gcovr --gcov-exclude='.*\b(deps|usr|out|obj|cctest|embedding)\b' -v -r Release/obj.target --xml -o ../coverage/coverage-cxx.xml --root=$(cd ../ && pwd)
73+
run: gcovr --gcov-exclude='.*\b(deps|usr|out|obj|cctest|embedding)\b' -v -r out/Release/obj.target --xml -o ./coverage/coverage-cxx.xml
7474
# Clean temporary output from gcov and c8, so that it's not uploaded:
7575
- name: Clean tmp
7676
run: rm -rf coverage/tmp && rm -rf out
@@ -79,3 +79,5 @@ jobs:
7979
with:
8080
directory: ./coverage
8181
token: ${{ secrets.CODECOV_TOKEN }}
82+
verbose: true
83+
fail_ci_if_error: true

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ coverage: coverage-test ## Run the tests and generate a coverage report.
253253
.PHONY: coverage-build
254254
coverage-build: all
255255
-$(MAKE) coverage-build-js
256-
if [ ! -d gcovr ]; then $(PYTHON) -m pip install -t gcovr gcovr==4.2; fi
256+
if [ ! -d gcovr ]; then $(PYTHON) -m pip install -t gcovr gcovr==7.2; fi
257257
$(MAKE)
258258

259259
.PHONY: coverage-build-js
@@ -270,6 +270,7 @@ coverage-test: coverage-build
270270
TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
271271
$(MAKE) coverage-report-js
272272
-(cd out && PYTHONPATH=../gcovr $(PYTHON) -m gcovr \
273+
--gcov-ignore-errors=no_working_dir_found \
273274
--gcov-exclude='.*\b(deps|usr|out|cctest|embedding)\b' -v \
274275
-r ../src/ --object-directory Release/obj.target \
275276
--html --html-details -o ../coverage/cxxcoverage.html \

0 commit comments

Comments
 (0)