Merge pull request #143 from szmyd/merge_stable

Merge stable

Author: szmyd

.github/workflows/build_dependencies.yml

@@ -159,17 +159,19 @@ jobs:
 
     - name: Code Coverage Run
       run: |
+        python -m pip install gcovr
         conan build \
             -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
             -o nuraft_mesg/*:coverage=True \
             -s:h build_type=${{ inputs.build-type }} \
             --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' }}

.github/workflows/merge_build.yml

@@ -32,16 +32,16 @@ jobs:
       build-type: ${{ matrix.build-type }}
       malloc-impl: ${{ matrix.malloc-impl }}
       tooling: ${{ matrix.tooling }}
-        #ChainBuild:
-        #  runs-on: "ubuntu-24.04"
-        #  steps:
-        #  - name: Start HomeStore Build
-        #    run: |
-        #      curl -L \
-        #        -X POST \
-        #        -H "Accept: application/vnd.github+json" \
-        #        -H "Authorization: Bearer ${{ secrets.CHAIN_BUILD_TOKEN }}"\
-        #        -H "X-GitHub-Api-Version: 2022-11-28" \
-        #        https://api.github.com/repos/eBay/homestore/actions/workflows/merge_build.yml/dispatches \
-        #        -d '{"ref":"master","inputs":{}}'
-        #    if: ${{ github.ref == 'refs/heads/main' }}
+  ChainBuild:
+    runs-on: "ubuntu-24.04"
+    steps:
+    - name: Start HomeStore Build
+      run: |
+        curl -L \
+          -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.CHAIN_BUILD_TOKEN }}"\
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/eBay/homestore/actions/workflows/merge_build.yml/dispatches \
+          -d '{"ref":"master","inputs":{}}'
+      if: ${{ github.ref == 'refs/heads/main' }}

.jenkins/Jenkinsfile

@@ -55,10 +55,10 @@ pipeline {
         stage("Compile") {
             steps {
                 sh "./prepare_v2.sh ; \
-                    conan create ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \
+                    conan build ${BUILD_MISSING} --build missing -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \
                     conan create ${BUILD_MISSING} -s:h build_type=Debug ${CONAN_FLAGS} . ; \
-                    conan create ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
-                    conan create ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:prerelease=True -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
+                    conan create ${BUILD_MISSING} --build missing -s:h build_type=RelWithDebInfo -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
+                    conan create ${BUILD_MISSING} --build missing -s:h build_type=RelWithDebInfo -o sisl/*:prerelease=True -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
                     "
             }
         }

conanfile.py

@@ -69,7 +69,12 @@ def requirements(self):
 
     def layout(self):
         self.folders.source = "."
-        self.folders.build = join("build", str(self.settings.build_type))
+        if self.options.get_safe("sanitize"):
+            self.folders.build = join("build", "Sanitized")
+        elif self.options.get_safe("coverage"):
+            self.folders.build = join("build", "Coverage")
+        else:
+            self.folders.build = join("build", str(self.settings.build_type))
         self.folders.generators = join(self.folders.build, "generators")
 
         self.cpp.source.includedirs = ["include"]

gcovr.cfg

@@ -0,0 +1,15 @@
+high-threshold = 80
+medium-threshold = 65
+
+merge-lines = yes
+
+exclude = .*build.*
+exclude = .*flip.*
+exclude = .*generate.*
+exclude = .*tests.*
+
+exclude-lines-by-pattern = .*DEBUG.*
+exclude-lines-by-pattern = .*DBG.*
+exclude-lines-by-pattern = .*LOG.*
+
+gcov-ignore-parse-errors = all