Skip to content

Merge stable3 #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
szmyd wants to merge 6 commits into from
Closed

Merge stable3 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2613921
Fix workflow for stable build. (#149)
szmyd Nov 26, 2025
241a1cb
Fix workflow for sisl branch.
szmyd Nov 26, 2025
0e795e8
Fix homestore reference in workflow.
szmyd Nov 26, 2025
3d68072
Use gcovr directly for code coverage. (#148)
szmyd Nov 26, 2025
6b7823e
Merge remote-tracking branch 'upstream/stable/v3.x' into merge_stable3
szmyd Nov 26, 2025
c54433b
Merge remote-tracking branch 'upstream/main' into merge_stable3
szmyd Dec 5, 2025
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
20 changes: 5 additions & 15 deletions .github/workflows/build_dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,11 @@ jobs:
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}

- name: Retrieve Dependencies NuRaftMesg
uses: actions/checkout@main
with:
repository: eBay/nuraft_mesg
path: import/nuraft_mesg
ref: main
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}

- name: Load NuRaftMesg Cache
uses: eBay/sisl/.github/actions/load_conan2@master
with:
testing: 'False'
path: import/nuraft_mesg
load_any: 'True'
key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
fail_on_cache_miss: true
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}

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


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

- name: Create and Test Package
Expand All @@ -177,6 +165,7 @@ jobs:

- name: Code Coverage Run
run: |
python -m pip install gcovr
conan build \
-o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
-o iomgr/*:testing=off \
Expand All @@ -186,11 +175,12 @@ jobs:
-s:h compiler.cppstd=23 \
--build missing \
.
gcovr --cobertura ./coverage.xml
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
files: ./coverage.xml
disable_search: true
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}
2 changes: 2 additions & 0 deletions .github/workflows/conan_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ on:
push:
branches:
- main
- stable/v3.x
pull_request:
branches:
- main
- stable/v3.x

jobs:
Build:
Expand Down
18 changes: 18 additions & 0 deletions gcovr.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
high-threshold = 80
medium-threshold = 65

merge-lines = yes
exclude-unreachable-branches = yes

exclude = .*build.*
exclude = .*flip.*
exclude = .*generate.*
exclude = .*test.*


exclude-lines-by-pattern = .*DEBUG.*
exclude-lines-by-pattern = .*DBG.*
exclude-lines-by-pattern = .*LOG.*
exclude-lines-by-pattern = .*ASSERT.*

gcov-ignore-parse-errors = all
Loading