Skip to content

Commit 6b7823e

Browse files
committed
Merge remote-tracking branch 'upstream/stable/v3.x' into merge_stable3
2 parents 44eb93c + 3d68072 commit 6b7823e

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

.github/workflows/build_dependencies.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,11 @@ jobs:
110110
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
111111
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
112112

113-
- name: Retrieve Dependencies NuRaftMesg
114-
uses: actions/checkout@main
115-
with:
116-
repository: eBay/nuraft_mesg
117-
path: import/nuraft_mesg
118-
ref: main
119-
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
120-
121113
- name: Load NuRaftMesg Cache
122114
uses: eBay/sisl/.github/actions/load_conan2@master
123115
with:
124-
testing: 'False'
125-
path: import/nuraft_mesg
116+
load_any: 'True'
126117
key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
127-
fail_on_cache_miss: true
128118
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
129119

130120
- name: Retrieve Dependencies HomeStore
@@ -144,13 +134,11 @@ jobs:
144134
fail_on_cache_miss: true
145135
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
146136

147-
148137
- name: Export Recipes
149138
run: |
150139
sudo apt-get install -y python3-pyelftools libaio-dev
151140
python -m pip install pyelftools
152141
conan export --user oss --channel master import/homestore
153-
conan export --user oss --channel main import/nuraft_mesg
154142
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
155143

156144
- name: Create and Test Package
@@ -177,6 +165,7 @@ jobs:
177165

178166
- name: Code Coverage Run
179167
run: |
168+
python -m pip install gcovr
180169
conan build \
181170
-o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
182171
-o iomgr/*:testing=off \
@@ -186,11 +175,12 @@ jobs:
186175
-s:h compiler.cppstd=23 \
187176
--build missing \
188177
.
178+
gcovr --cobertura ./coverage.xml
189179
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}
190180

191181
- name: Upload coverage reports to Codecov
192182
uses: codecov/codecov-action@v5
193183
with:
194-
token: ${{ secrets.CODECOV_TOKEN }}
195-
verbose: true
184+
files: ./coverage.xml
185+
disable_search: true
196186
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}

.github/workflows/conan_build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ on:
55
push:
66
branches:
77
- main
8+
- stable/v3.x
89
pull_request:
910
branches:
1011
- main
12+
- stable/v3.x
1113

1214
jobs:
1315
Build:

gcovr.cfg

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
exclude-lines-by-pattern = .*ASSERT.*
17+
18+
gcov-ignore-parse-errors = all

0 commit comments

Comments
 (0)