Skip to content

Commit 281a1df

Browse files
authored
Merge pull request #153 from szmyd/merge_stable
Merge stable
2 parents a4b1a86 + ed37d3c commit 281a1df

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

.github/workflows/build_dependencies.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ jobs:
177177

178178
- name: Code Coverage Run
179179
run: |
180+
python -m pip install gcovr
180181
conan build \
181182
-o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
182183
-o iomgr/*:testing=off \
@@ -186,11 +187,12 @@ jobs:
186187
-s:h compiler.cppstd=23 \
187188
--build missing \
188189
.
190+
gcovr --cobertura ./coverage.xml
189191
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}
190192

191193
- name: Upload coverage reports to Codecov
192194
uses: codecov/codecov-action@v5
193195
with:
194-
token: ${{ secrets.CODECOV_TOKEN }}
195-
verbose: true
196+
files: ./coverage.xml
197+
disable_search: true
196198
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}

.jenkins/Jenkinsfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,6 @@ pipeline {
4848
}
4949
}
5050

51-
stage('Tag Stable Build') {
52-
when { branch "${STABLE_BRANCH}" }
53-
steps {
54-
script {
55-
TAG = "${VER}@"
56-
}
57-
}
58-
}
59-
6051
stage("Compile") {
6152
steps {
6253
sh "conan build -s:h compiler.cppstd=23 ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \

gcovr.cfg

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
high-threshold = 80
2+
medium-threshold = 65
3+
4+
merge-lines = yes
5+
exclude-unreachable-branches = yes
6+
7+
exclude = .*build.*
8+
exclude = .*flip.*
9+
exclude = .*generate.*
10+
exclude = .*test.*
11+
12+
13+
exclude-lines-by-pattern = .*DEBUG.*
14+
exclude-lines-by-pattern = .*DBG.*
15+
exclude-lines-by-pattern = .*LOG.*
16+
17+
gcov-ignore-parse-errors = all

0 commit comments

Comments
 (0)