From 261392165c83d2b2761d2ed2217f3dcc20b1c6db Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Wed, 26 Nov 2025 09:56:50 -0700 Subject: [PATCH 1/6] Fix workflow for stable build. (#149) --- .github/workflows/build_dependencies.yml | 9 --------- .github/workflows/conan_build.yml | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index 4e25677..702bb8e 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -107,14 +107,6 @@ 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_conan@master with: @@ -153,7 +145,6 @@ jobs: sudo apt-get install -y python3-pyelftools libaio-dev python -m pip install pyelftools conan export import/homestore oss/master - conan export import/nuraft_mesg oss/main cached_pkgs=$(ls -1d ~/.conan/data/*/*/*/*/export | sed 's,.*data/,,' | cut -d'/' -f1,2 | paste -sd',' - -) echo "::info:: Pre-cached: ${cached_pkgs}" if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/conan_build.yml b/.github/workflows/conan_build.yml index 422faad..fcf1047 100644 --- a/.github/workflows/conan_build.yml +++ b/.github/workflows/conan_build.yml @@ -5,9 +5,11 @@ on: push: branches: - main + - stable/v3.x pull_request: branches: - main + - stable/v3.x jobs: Build: From 241a1cbb87feb1254a53b596e3b40c22b828e22d Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Wed, 26 Nov 2025 17:00:20 +0000 Subject: [PATCH 2/6] Fix workflow for sisl branch. --- .github/workflows/build_commit.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_commit.yml b/.github/workflows/build_commit.yml index 4e66af8..a54d69b 100644 --- a/.github/workflows/build_commit.yml +++ b/.github/workflows/build_commit.yml @@ -18,9 +18,9 @@ on: jobs: SislDeps: - uses: eBay/sisl/.github/workflows/build_dependencies.yml@master + uses: eBay/sisl/.github/workflows/build_dependencies.yml@stable/v12.x with: - branch: master + branch: stable/v12.x platform: ${{ inputs.platform }} build-type: ${{ inputs.build-type }} malloc-impl: ${{ inputs.malloc-impl }} @@ -30,9 +30,9 @@ jobs: NuraftMesgDeps: needs: SislDeps - uses: eBay/nuraft_mesg/.github/workflows/build_dependencies.yml@main + uses: eBay/nuraft_mesg/.github/workflows/build_dependencies.yml@stable/v3.x with: - branch: main + branch: stable/v3.x platform: ${{ inputs.platform }} build-type: ${{ inputs.build-type }} malloc-impl: ${{ inputs.malloc-impl }} @@ -42,9 +42,9 @@ jobs: IOMgrDeps: needs: [SislDeps] - uses: eBay/iomanager/.github/workflows/build_dependencies.yml@master + uses: eBay/iomanager/.github/workflows/build_dependencies.yml@stable/v11.x with: - branch: master + branch: stable/v11.x platform: ${{ inputs.platform }} build-type: ${{ inputs.build-type }} malloc-impl: ${{ inputs.malloc-impl }} @@ -54,9 +54,9 @@ jobs: HomeStoreDeps: needs: [IOMgrDeps, NuraftMesgDeps] - uses: eBay/homestore/.github/workflows/build_dependencies.yml@master + uses: eBay/homestore/.github/workflows/build_dependencies.yml@stable/v6.x with: - branch: master + branch: stable/v6.x platform: ${{ inputs.platform }} build-type: ${{ inputs.build-type }} malloc-impl: ${{ inputs.malloc-impl }} From 0e795e856b8753e3b5e846830259ee3914b0eb91 Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Wed, 26 Nov 2025 17:17:14 +0000 Subject: [PATCH 3/6] Fix homestore reference in workflow. --- .github/workflows/build_dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index 702bb8e..b987de5 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -121,7 +121,7 @@ jobs: with: repository: eBay/HomeStore path: import/homestore - ref: master + ref: stable/v6.x if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - name: Load HomeStore Cache From 3d68072104763abee3079d19602a03d49c6c1af1 Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Wed, 26 Nov 2025 10:57:16 -0700 Subject: [PATCH 4/6] Use gcovr directly for code coverage. (#148) --- .github/workflows/build_dependencies.yml | 9 +++++---- gcovr.cfg | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 gcovr.cfg diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index b987de5..c50358d 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -133,7 +133,6 @@ jobs: fail_on_cache_miss: true if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }} - - name: Setup Conan uses: eBay/sisl/.github/actions/setup_conan@master with: @@ -223,6 +222,7 @@ jobs: - name: Code Coverage Run run: | + python -m pip install gcovr conan install \ -o sisl:malloc_impl=${{ inputs.malloc-impl }} \ -o iomgr:testing=off \ @@ -232,11 +232,12 @@ jobs: --build missing \ . conan build . + gcovr --cobertura ./coverage.xml if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }} - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: - token: ${{ secrets.CODECOV_TOKEN }} - gcov: true + files: ./coverage.xml + disable_search: true if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }} diff --git a/gcovr.cfg b/gcovr.cfg new file mode 100644 index 0000000..cfba991 --- /dev/null +++ b/gcovr.cfg @@ -0,0 +1,17 @@ +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.* + +gcov-ignore-parse-errors = all From ba740453216624889a6290d166afe933ab601df3 Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Tue, 16 Dec 2025 08:33:14 -0700 Subject: [PATCH 5/6] Fix tag --- .jenkins/Jenkinsfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 730c521..b766c67 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -48,15 +48,6 @@ pipeline { } } - stage('Tag Stable Build') { - when { branch "${STABLE_BRANCH}" } - steps { - script { - TAG = "${VER}@" - } - } - } - stage("Compile") { steps { sh "conan create ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \ From 635a062bad03652d786e4018d755e68d6d8b6ae6 Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Thu, 18 Dec 2025 16:54:47 +0000 Subject: [PATCH 6/6] Correct override --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 1489674..b04d011 100644 --- a/conanfile.py +++ b/conanfile.py @@ -48,7 +48,7 @@ def requirements(self): self.requires("homestore/[^6.20]@oss/master", transitive_headers=True) self.requires("iomgr/[^11.3]@oss/master", transitive_headers=True) self.requires("sisl/[^12.4.7]@oss/master", transitive_headers=True) - self.requires("lz4/1.9.4", override=True) + self.requires("lz4/1.10.0", override=True) def validate(self): if self.info.settings.compiler.cppstd: