Skip to content

Commit 760aefe

Browse files
JacksonYao287JacksonYao287
committed
upgrade to homobject v5: remove folly dependency
1 parent d9a17ca commit 760aefe

69 files changed

Lines changed: 3161 additions & 3227 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_commit.yml‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,50 +18,64 @@ on:
1818
tooling:
1919
required: true
2020
type: string
21+
compiler:
22+
required: false
23+
type: string
24+
default: 'gcc'
25+
conan-channel:
26+
required: false
27+
type: string
28+
default: 'dev'
2129

2230
jobs:
2331
SislDeps:
24-
uses: ebay/sisl/.github/workflows/build_dependencies.yml@stable/v13.x
32+
uses: ebay/sisl/.github/workflows/build_dependencies.yml@dev/v14.x
2533
with:
26-
branch: stable/v13.x
34+
branch: dev/v14.x
2735
platform: ${{ inputs.platform }}
2836
build-type: ${{ inputs.build-type }}
2937
malloc-impl: ${{ inputs.malloc-impl }}
38+
compiler: ${{ inputs.compiler }}
39+
conan-channel: ${{ inputs.conan-channel }}
3040
tooling: None
3141
if: ${{ github.event_name != 'pull_request' }}
3242

3343
NuraftMesgDeps:
3444
needs: SislDeps
35-
uses: eBay/nuraft_mesg/.github/workflows/build_dependencies.yml@stable/v4.x
45+
uses: eBay/nuraft_mesg/.github/workflows/build_dependencies.yml@dev/v5.x
3646
with:
37-
branch: stable/v4.x
47+
branch: dev/v5.x
3848
platform: ${{ inputs.platform }}
3949
build-type: ${{ inputs.build-type }}
4050
malloc-impl: ${{ inputs.malloc-impl }}
51+
compiler: ${{ inputs.compiler }}
52+
conan-channel: ${{ inputs.conan-channel }}
4153
tooling: None
4254
if: ${{ github.event_name != 'pull_request' }}
4355

4456
IOMgrDeps:
4557
needs: [SislDeps]
46-
uses: eBay/iomanager/.github/workflows/build_dependencies.yml@stable/v12.x
58+
uses: eBay/iomanager/.github/workflows/build_dependencies.yml@dev/v13.x
4759
with:
48-
branch: stable/v12.x
60+
branch: dev/v13.x
4961
platform: ${{ inputs.platform }}
5062
build-type: ${{ inputs.build-type }}
5163
malloc-impl: ${{ inputs.malloc-impl }}
52-
prerelease: ${{ inputs.prerelease }}
64+
compiler: ${{ inputs.compiler }}
65+
conan-channel: ${{ inputs.conan-channel }}
5366
tooling: None
5467
if: ${{ github.event_name != 'pull_request' }}
5568

5669
HomeStoreDeps:
5770
needs: [IOMgrDeps, NuraftMesgDeps]
58-
uses: eBay/homestore/.github/workflows/build_dependencies.yml@stable/v7.x
71+
uses: eBay/homestore/.github/workflows/build_dependencies.yml@dev/v8.x
5972
with:
60-
branch: stable/v7.x
73+
branch: dev/v8.x
6174
platform: ${{ inputs.platform }}
6275
build-type: ${{ inputs.build-type }}
6376
malloc-impl: ${{ inputs.malloc-impl }}
64-
prerelease: ${{ inputs.prerelease }}
77+
compiler: ${{ inputs.compiler }}
78+
conan-channel: ${{ inputs.conan-channel }}
6579
tooling: None
6680
if: ${{ github.event_name != 'pull_request' }}
6781

@@ -74,6 +88,8 @@ jobs:
7488
build-type: ${{ inputs.build-type }}
7589
malloc-impl: ${{ inputs.malloc-impl }}
7690
prerelease: ${{ inputs.prerelease }}
91+
compiler: ${{ inputs.compiler }}
92+
conan-channel: ${{ inputs.conan-channel }}
7793
tooling: ${{ inputs.tooling }}
7894
testing: 'True'
7995
if: ${{ github.event_name != 'pull_request' }}
@@ -86,6 +102,8 @@ jobs:
86102
build-type: ${{ inputs.build-type }}
87103
malloc-impl: ${{ inputs.malloc-impl }}
88104
prerelease: ${{ inputs.prerelease }}
105+
compiler: ${{ inputs.compiler }}
106+
conan-channel: ${{ inputs.conan-channel }}
89107
tooling: ${{ inputs.tooling }}
90108
testing: 'True'
91109
if: ${{ github.event_name == 'pull_request' }}

‎.github/workflows/build_dependencies.yml‎

Lines changed: 93 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ on:
2727
required: false
2828
type: string
2929
default: 'False'
30+
compiler:
31+
required: false
32+
type: string
33+
default: 'gcc'
34+
conan-channel:
35+
required: false
36+
type: string
37+
default: 'dev'
3038
workflow_dispatch:
3139
inputs:
3240
platform:
@@ -64,7 +72,9 @@ on:
6472
tooling:
6573
required: false
6674
type: choice
67-
- 'Sanitize'
75+
options:
76+
- 'AddressSanitize'
77+
- 'ThreadSanitize'
6878
- 'Coverage'
6979
- 'None'
7080
default: 'None'
@@ -76,6 +86,16 @@ on:
7686
- 'True'
7787
- 'False'
7888
default: 'True'
89+
compiler:
90+
required: false
91+
type: choice
92+
options:
93+
- gcc
94+
default: gcc
95+
conan-channel:
96+
required: false
97+
type: string
98+
default: 'dev'
7999

80100
jobs:
81101
BuildHomeObjectDeps:
@@ -95,42 +115,63 @@ jobs:
95115
if: ${{ inputs.testing == 'False' }}
96116

97117
- name: Setup Conan
98-
uses: ebay/sisl/.github/actions/setup_conan2@stable/v13.x
118+
uses: ebay/sisl/.github/actions/setup_conan2@dev/v14.x
99119
with:
100120
platform: ${{ inputs.platform }}
121+
compiler: ${{ inputs.compiler }}
101122
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
102123

103124
- name: Load HomeObject Cache
104125
id: restore-cache
105-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
126+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
106127
with:
107128
testing: ${{ inputs.testing }}
108129
key_prefix: HomeObjectDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
109130

131+
- name: Retrieve Dependencies Sisl
132+
uses: actions/checkout@v4
133+
with:
134+
repository: eBay/sisl
135+
path: import/sisl
136+
ref: dev/v14.x
137+
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
138+
110139
- name: Load Sisl Cache
111-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
140+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
141+
with:
142+
testing: 'False'
143+
path: import/sisl
144+
key_prefix: SislDeps14-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.compiler }}
145+
fail_on_cache_miss: true
146+
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
147+
148+
- name: Retrieve Dependencies IOMgr
149+
uses: actions/checkout@v4
112150
with:
113-
load_any: 'True'
114-
key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
151+
repository: eBay/iomanager
152+
path: import/iomgr
153+
ref: dev/v13.x
115154
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
116155

117156
- name: Load IOMgr Cache
118-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
157+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
119158
with:
120-
load_any: 'True'
121-
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
159+
testing: 'False'
160+
path: import/iomgr
161+
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.compiler }}
162+
fail_on_cache_miss: true
122163
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
123164

124165
- name: Retrieve Dependencies NuRaftMesg
125166
uses: actions/checkout@v4
126167
with:
127168
repository: eBay/nuraft_mesg
128169
path: import/nuraft_mesg
129-
ref: stable/v4.x
170+
ref: dev/v5.x
130171
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
131172

132173
- name: Load NuRaftMesg Cache
133-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
174+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
134175
with:
135176
testing: 'False'
136177
path: import/nuraft_mesg
@@ -143,25 +184,41 @@ jobs:
143184
with:
144185
repository: eBay/HomeStore
145186
path: import/homestore
146-
ref: stable/v7.x
187+
ref: dev/v8.x
147188
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
148189

149190
- name: Load HomeStore Cache
150-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
191+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
151192
with:
152193
testing: 'False'
153194
path: import/homestore
154-
key_prefix: HomestoreDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
195+
key_prefix: HomestoreDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
155196
fail_on_cache_miss: true
156197
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
157198

158-
159199
- name: Export Recipes
160200
run: |
161201
sudo apt-get install -y python3-pyelftools libaio-dev
162202
python -m pip install pyelftools
163-
conan export import/homestore
164-
conan export import/nuraft_mesg
203+
sudo rm -rf $ANDROID_HOME
204+
205+
pushd import/sisl
206+
./prepare_v2.sh
207+
conan export --user oss --channel ${{ inputs.conan-channel }} .
208+
popd
209+
210+
pushd import/iomgr
211+
conan export --user oss --channel ${{ inputs.conan-channel }} .
212+
popd
213+
214+
pushd import/nuraft_mesg
215+
./prepare_v2.sh
216+
conan export --user oss --channel ${{ inputs.conan-channel }} .
217+
popd
218+
219+
pushd import/homestore
220+
conan export --user oss --channel ${{ inputs.conan-channel }} .
221+
popd
165222
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
166223

167224
- name: Build Cache
@@ -170,11 +227,9 @@ jobs:
170227
echo "Disk space usage"
171228
sudo df -h
172229
sudo ls -l /tmp
173-
sudo rm -rf $ANDROID_HOME
174230
echo "Disk space usage after cleanup"
175231
sudo df -h
176232
conan install \
177-
-c tools.build:skip_test=True \
178233
${pre} \
179234
-o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
180235
-o iomgr/*:testing=off \
@@ -184,31 +239,35 @@ jobs:
184239
--format=json \
185240
--build missing \
186241
. > ~/build.json
187-
conan list --graph ~/build.json --graph-binaries=build --format=json > ~/pkglist.json
242+
conan list --graph ~/build.json --graph-binaries=build,cache --format=json > ~/pkglist.json
188243
if: ${{ steps.restore-cache.outputs.cache-hit != 'true' }}
189244

190245
- name: Save Conan Cache
191-
uses: eBay/sisl/.github/actions/store_conan2@stable/v13.x
246+
uses: eBay/sisl/.github/actions/store_conan2@dev/v14.x
192247
with:
193248
key_prefix: HomeObjectDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
194249
if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
195250

196251
- name: Reload Sisl Cache
197-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
252+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
198253
with:
199-
load_any: 'True'
200-
key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
254+
testing: 'False'
255+
path: import/sisl
256+
key_prefix: SislDeps14-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.compiler }}
257+
fail_on_cache_miss: true
201258
if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
202259

203260
- name: Reload IOMgr Cache
204-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
261+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
205262
with:
206-
load_any: 'True'
207-
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
263+
testing: 'False'
264+
path: import/iomgr
265+
key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.compiler }}
266+
fail_on_cache_miss: true
208267
if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
209268

210269
- name: Reload NuRaftMesg Cache
211-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
270+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
212271
with:
213272
testing: 'False'
214273
path: import/nuraft_mesg
@@ -217,17 +276,19 @@ jobs:
217276
if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
218277

219278
- name: Reload HomeStore Cache
220-
uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
279+
uses: eBay/sisl/.github/actions/load_conan2@dev/v14.x
221280
with:
222281
testing: 'False'
223282
path: import/homestore
224-
key_prefix: HomestoreDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
283+
key_prefix: HomestoreDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
225284
fail_on_cache_miss: true
226285
if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
227286

228287
- name: Create and Test Package
229288
run: |
230-
sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False")
289+
if [[ "${{ inputs.tooling }}" == "AddressSanitize" ]]; then sanitize="address"
290+
elif [[ "${{ inputs.tooling }}" == "ThreadSanitize" ]]; then sanitize="thread"
291+
else sanitize="False"; fi
231292
pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o iomgr/*:prerelease=${{ inputs.prerelease }}" || echo "")
232293
conan create \
233294
${pre} \
@@ -236,6 +297,7 @@ jobs:
236297
-o homestore/*:testing=off \
237298
-o homeobject/*:sanitize=${sanitize} \
238299
-s:h build_type=${{ inputs.build-type }} \
300+
${{ inputs.conan-channel != '' && format('--user oss --channel {0}', inputs.conan-channel) || '' }} \
239301
--build missing \
240302
.
241303
if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }}

0 commit comments

Comments
 (0)