Skip to content

Commit d628db1

Browse files
szmydszmyd
committed
v4.x - Use gcc-13
1 parent 6d277c2 commit d628db1

File tree

7 files changed

+62
-60
lines changed

7 files changed

+62
-60
lines changed

‎.github/workflows/build_commit.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ on:
1818

1919
jobs:
2020
SislDeps:
21-
uses: eBay/sisl/.github/workflows/build_dependencies.yml@master
21+
uses: ebay/sisl/.github/workflows/build_dependencies.yml@master
2222
with:
2323
branch: master
2424
platform: ${{ inputs.platform }}
2525
build-type: ${{ inputs.build-type }}
2626
malloc-impl: ${{ inputs.malloc-impl }}
27-
prerelease: "False"
2827
tooling: None
2928
if: ${{ github.event_name != 'pull_request' }}
3029

@@ -36,7 +35,6 @@ jobs:
3635
platform: ${{ inputs.platform }}
3736
build-type: ${{ inputs.build-type }}
3837
malloc-impl: ${{ inputs.malloc-impl }}
39-
prerelease: "False"
4038
tooling: None
4139
if: ${{ github.event_name != 'pull_request' }}
4240

‎.github/workflows/build_dependencies.yml‎

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
platform:
77
required: false
8-
default: 'ubuntu-22.04'
8+
default: 'ubuntu-24.04'
99
type: string
1010
branch:
1111
required: true
@@ -30,11 +30,8 @@ on:
3030
required: true
3131
type: choice
3232
options:
33-
- ubuntu-22.04
34-
- ubuntu-20.04
35-
- macos-13
36-
- macos-12
37-
default: 'ubuntu-22.04'
33+
- ubuntu-24.04
34+
default: 'ubuntu-24.04'
3835
branch:
3936
required: true
4037
type: string
@@ -86,22 +83,28 @@ jobs:
8683
ref: ${{ inputs.branch }}
8784
if: ${{ inputs.testing == 'False' }}
8885

86+
- name: Setup Conan
87+
uses: ebay/sisl/.github/actions/setup_conan2@master
88+
with:
89+
platform: ${{ inputs.platform }}
90+
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
91+
8992
- name: Load HomeBlocks Cache
9093
id: restore-cache
91-
uses: eBay/sisl/.github/actions/load_conan@master
94+
uses: eBay/sisl/.github/actions/load_conan2@master
9295
with:
9396
testing: ${{ inputs.testing }}
9497
key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
9598

9699
- name: Load Sisl Cache
97-
uses: eBay/sisl/.github/actions/load_conan@master
100+
uses: eBay/sisl/.github/actions/load_conan2@master
98101
with:
99102
load_any: 'True'
100-
key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
103+
key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
101104
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
102105

103106
- name: Load IOMgr Cache
104-
uses: eBay/sisl/.github/actions/load_conan@master
107+
uses: eBay/sisl/.github/actions/load_conan2@master
105108
with:
106109
load_any: 'True'
107110
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
@@ -116,11 +119,11 @@ jobs:
116119
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
117120

118121
- name: Load NuRaftMesg Cache
119-
uses: eBay/sisl/.github/actions/load_conan@master
122+
uses: eBay/sisl/.github/actions/load_conan2@master
120123
with:
121124
testing: 'False'
122125
path: import/nuraft_mesg
123-
key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
126+
key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
124127
fail_on_cache_miss: true
125128
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
126129

@@ -133,7 +136,7 @@ jobs:
133136
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
134137

135138
- name: Load HomeStore Cache
136-
uses: eBay/sisl/.github/actions/load_conan@master
139+
uses: eBay/sisl/.github/actions/load_conan2@master
137140
with:
138141
testing: 'False'
139142
path: import/homestore
@@ -142,65 +145,60 @@ jobs:
142145
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
143146

144147

145-
- name: Setup Conan
146-
uses: eBay/sisl/.github/actions/setup_conan@master
147-
with:
148-
platform: ${{ inputs.platform }}
149-
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
150-
151148
- name: Export Recipes
152149
run: |
153150
sudo apt-get install -y python3-pyelftools libaio-dev
154151
python -m pip install pyelftools
155-
conan export import/homestore oss/master
156-
conan export import/nuraft_mesg oss/main
157-
cached_pkgs=$(ls -1d ~/.conan/data/*/*/*/*/export | sed 's,.*data/,,' | cut -d'/' -f1,2 | paste -sd',' - -)
158-
echo "::info:: Pre-cached: ${cached_pkgs}"
152+
conan export --user oss --channel master import/homestore
153+
conan export --user oss --channel main import/nuraft_mesg
159154
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
160155

161156
- name: Build Cache
162157
run: |
163158
conan install \
164159
-c tools.build:skip_test=True \
165-
-o sisl:malloc_impl=${{ inputs.malloc-impl }} \
166-
-o iomgr:testing=off \
167-
-o homestore:testing=off \
168-
-s build_type=${{ inputs.build-type }} \
160+
-o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
161+
-o iomgr/*:testing=off \
162+
-o homestore/*:testing=off \
163+
-s:h build_type=${{ inputs.build-type }} \
164+
-c tools.build:skip_test=True \
165+
--format=json \
169166
--build missing \
170-
.
167+
. > ~/build.json
168+
conan list --graph ~/build.json --graph-binaries=build --format=json > ~/pkglist.json
171169
if: ${{ steps.restore-cache.outputs.cache-hit != 'true' }}
172170

173171
- name: Save Conan Cache
174-
uses: eBay/sisl/.github/actions/store_conan@master
172+
uses: eBay/sisl/.github/actions/store_conan2@master
175173
with:
176174
key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
177175
if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
178176

179177
- name: Reload Sisl Cache
180-
uses: eBay/sisl/.github/actions/load_conan@master
178+
uses: eBay/sisl/.github/actions/load_conan2@master
181179
with:
182180
load_any: 'True'
183-
key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
181+
key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
184182
if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
185183

186184
- name: Reload IOMgr Cache
187-
uses: eBay/sisl/.github/actions/load_conan@master
185+
uses: eBay/sisl/.github/actions/load_conan2@master
188186
with:
189187
load_any: 'True'
190188
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
191189
if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
192190

193191
- name: Reload NuRaftMesg Cache
194-
uses: eBay/sisl/.github/actions/load_conan@master
192+
uses: eBay/sisl/.github/actions/load_conan2@master
195193
with:
196194
testing: 'False'
197195
path: import/nuraft_mesg
198-
key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
196+
key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
199197
fail_on_cache_miss: true
200198
if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
201199

202200
- name: Reload HomeStore Cache
203-
uses: eBay/sisl/.github/actions/load_conan@master
201+
uses: eBay/sisl/.github/actions/load_conan2@master
204202
with:
205203
testing: 'False'
206204
path: import/homestore
@@ -221,31 +219,30 @@ jobs:
221219
run: |
222220
sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False")
223221
conan create \
224-
-o sisl:malloc_impl=${{ inputs.malloc-impl }} \
225-
-o iomgr:testing=off \
226-
-o homestore:testing=off \
227-
-o homeblocks:sanitize=${sanitize} \
228-
-s build_type=${{ inputs.build-type }} \
222+
-o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
223+
-o iomgr/*:testing=off \
224+
-o homestore/*:testing=off \
225+
-o homeblocks/*:sanitize=${sanitize} \
226+
-s:h build_type=${{ inputs.build-type }} \
229227
--build missing \
230228
.
231229
if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }}
232230

233231
- name: Code Coverage Run
234232
run: |
235-
conan install \
236-
-o sisl:malloc_impl=${{ inputs.malloc-impl }} \
237-
-o iomgr:testing=off \
238-
-o homestore:testing=off \
239-
-o coverage=True \
240-
-s build_type=${{ inputs.build-type }} \
233+
conan build \
234+
-o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
235+
-o iomgr/*:testing=off \
236+
-o homestore/*:testing=off \
237+
-o homeblocks/*:coverage=True \
238+
-s:h build_type=${{ inputs.build-type }} \
241239
--build missing \
242240
.
243-
conan build .
244241
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}
245242

246243
- name: Upload coverage reports to Codecov
247-
uses: codecov/codecov-action@v4
244+
uses: codecov/codecov-action@v5
248245
with:
249246
token: ${{ secrets.CODECOV_TOKEN }}
250-
gcov: true
247+
verbose: true
251248
if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}

‎.github/workflows/conan_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
platform: ["ubuntu-22.04"]
17+
platform: ["ubuntu-24.04"]
1818
build-type: ["Debug", "Release"]
1919
malloc-impl: ["libc", "tcmalloc"]
2020
tooling: ["Sanitize", "Coverage", "None"]

‎.jenkins/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pipeline {
2-
agent { label 'sds-builder-v7' }
2+
agent { label 'sds-builder-v8' }
33

44
environment {
55
ARTIFACTORY_PASS = credentials('ARTIFACTORY_PASS')

‎conanfile.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class HomeBlocksConan(ConanFile):
1111
name = "homeblocks"
12-
version = "3.0.6"
12+
version = "4.0.0"
1313
homepage = "https://github.com/eBay/HomeBlocks"
1414
description = "Block Store built on HomeStore"
1515
topics = ("ebay")
@@ -42,13 +42,12 @@ def configure(self):
4242
raise ConanInvalidConfiguration("Sanitizer does not work with Code Coverage!")
4343

4444
def build_requirements(self):
45-
self.test_requires("gtest/1.14.0")
45+
self.test_requires("gtest/1.17.0")
4646

4747
def requirements(self):
48-
self.requires("homestore/[^6.20]@oss/master", transitive_headers=True)
49-
self.requires("iomgr/[^11.3]@oss/master", transitive_headers=True)
50-
self.requires("sisl/[^12.4.7]@oss/master", transitive_headers=True)
51-
self.requires("lz4/1.9.4", override=True)
48+
self.requires("homestore/[^7.0]@oss/master", transitive_headers=True)
49+
self.requires("iomgr/[^12.0]@oss/master", transitive_headers=True)
50+
self.requires("sisl/[^13.0]@oss/master", transitive_headers=True)
5251

5352
def validate(self):
5453
if self.info.settings.compiler.cppstd:

‎src/include/homeblks/common.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
#include <boost/intrusive_ptr.hpp>
2020
#include <folly/Expected.h>
2121
#include <folly/Unit.h>
22+
#pragma GCC diagnostic push
23+
#pragma GCC diagnostic ignored "-Wuninitialized"
24+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
2225
#include <folly/futures/Future.h>
26+
#pragma GCC diagnostic pop
2327
#include <sisl/logging/logging.h>
2428
#include <homestore/homestore_decl.hpp>
2529
#include <homestore/superblk_handler.hpp>

‎src/lib/listener.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
*********************************************************************************/
1616
#pragma once
1717

18+
#pragma GCC diagnostic push
19+
#pragma GCC diagnostic ignored "-Wuninitialized"
20+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
1821
#include <folly/futures/Future.h>
22+
#pragma GCC diagnostic pop
1923
#include <homestore/replication/repl_dev.h>
2024
#include "homeblks_impl.hpp"
2125

0 commit comments

Comments
 (0)