Page MenuHomePhabricator
Differential D4493

[Services] Update blob CMake project
ClosedPublic
Actions

Authored by • jon on Jul 8 2022, 10:58 PM.
Tags
None
Referenced Files
F3384426: D4493.diff
Thu, Nov 28, 8:58 PM
Unknown Object (File)
Mon, Nov 25, 9:51 AM
Unknown Object (File)
Mon, Nov 25, 9:36 AM
Unknown Object (File)
Mon, Nov 25, 7:26 AM
Unknown Object (File)
Mon, Nov 25, 7:19 AM
Unknown Object (File)
Tue, Nov 19, 4:35 AM
Unknown Object (File)
Mon, Nov 18, 8:29 PM
Unknown Object (File)
Oct 27 2024, 4:32 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• karol
• max
tomek

Details

Reviewers
• max
• karol
atul
Commits
rCOMMc11d07fedc73: [Services] Update blob CMake project
Summary

Make blob more nix friendly
and make use of the native/cpp cmake work

DatabaseEntitiesTools.h was moved to lib/src as it was largely duplicated across three projects

Backup docker + cmake is fixed in D4494

Test Plan
nix develop
cd services/blob && mkdir build && cd build && cmake .. && make

docker:

cd services/base-image
docker build -t commapp/services-base . -f Dockerfile

cd ../..
docker build . -f services/blob/Dockerfile

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• jon created this revision.Jul 8 2022, 10:58 PM
Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptJul 8 2022, 10:58 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Jul 8 2022, 11:00 PM
Harbormaster failed remote builds in B10434: Diff 14378!
• jon updated this revision to Diff 14906.Jul 25 2022, 9:03 PM

Rebase

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 25 2022, 9:05 PM
Harbormaster failed remote builds in B10843: Diff 14906!
• jon added a parent revision: D4490: [Services] Adjust tunnelbroker with CMake changes.Jul 26 2022, 8:23 AM
• jon added a child revision: D4494: [Services] Update backup CMake.
• jon edited parent revisions, added: D4489: [Services] Export shared services cpp as CMake Project; removed: D4490: [Services] Adjust tunnelbroker with CMake changes.Jul 28 2022, 6:27 PM
• jon updated this revision to Diff 15107.Jul 29 2022, 9:52 AM

Adjust cmake to new docker workflow

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 29 2022, 9:52 AM
Harbormaster failed remote builds in B10979: Diff 15107!
• jon updated this revision to Diff 15119.Jul 29 2022, 3:04 PM

Clean up cmake and docker build

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 29 2022, 3:05 PM
Harbormaster failed remote builds in B10985: Diff 15119!
• jon edited the test plan for this revision. (Show Details)Jul 29 2022, 4:06 PM
• jon requested review of this revision.Jul 29 2022, 4:09 PM

gates will be failing until base-image is updated

• jon edited the summary of this revision. (Show Details)Jul 29 2022, 4:10 PM
• jon added a reviewer: atul.
atul requested changes to this revision.Aug 1 2022, 7:04 AM
In D4493#134704, @jon wrote:

gates will be failing until base-image is updated

Is there an ETA for that?

Should I review this diff right now, or should I put it back on your queue until it's ready?

This revision now requires changes to proceed.Aug 1 2022, 7:04 AM
• jon added a comment.Aug 1 2022, 7:40 AM

The test plan doesn't need dockerhub. And waiting for the base image diff to be approved before pushing https://phab.comm.dev/D4630

atul accepted this revision.Aug 1 2022, 8:59 AM
cd services/base-image
docker build -t commapp/services-base . -f Dockerfile

cd ../..
docker build . -f services/blob/Dockerfile

Tested this locally and it build successfully

This revision is now accepted and ready to land.Aug 1 2022, 8:59 AM
• jon updated this revision to Diff 15165.Aug 1 2022, 12:48 PM

Update base-image reference

Harbormaster failed remote builds in B11024: Diff 15165!Aug 1 2022, 12:48 PM
• jon added a parent revision: D4687: [Services] Prune duplicated DatabaseEntitiesTools.h.Aug 1 2022, 12:59 PM
• jon removed a parent revision: D4687: [Services] Prune duplicated DatabaseEntitiesTools.h.Aug 1 2022, 1:01 PM
• jon updated this revision to Diff 15174.Aug 1 2022, 1:24 PM

rebase with lint fixes

Harbormaster failed remote builds in B11033: Diff 15174!Aug 1 2022, 1:25 PM
• jon retitled this revision from [Services] Export blob as CMake project to [Services] Update blob CMake project.Aug 1 2022, 1:39 PM
• jon mentioned this in D4671: [Services] Update tunnelbroker Dockerfile & cmake.Aug 3 2022, 10:05 PM
• jon mentioned this in D4489: [Services] Export shared services cpp as CMake Project.Aug 3 2022, 10:09 PM
• jon edited the summary of this revision. (Show Details)
• jon updated this revision to Diff 15296.Aug 3 2022, 11:23 PM
• jon edited the summary of this revision. (Show Details)

Rebase with fixes

Harbormaster failed remote builds in B11105: Diff 15296!Aug 3 2022, 11:25 PM
• jon added a comment.Aug 5 2022, 11:57 AM

I was going to try and fix this by doing the header additions first, but I realize I really can't with #include "DatabaseEntitiesTools.h" still needing to be somewhere.

• jon mentioned this in D4762: [Services] Allow blob to be built on MacOS.Aug 5 2022, 4:44 PM
• jon added a parent revision: D4762: [Services] Allow blob to be built on MacOS.Aug 5 2022, 4:46 PM
• jon updated this revision to Diff 15391.Aug 5 2022, 5:15 PM

Rebase with MacOS Fixes

Harbormaster failed remote builds in B11184: Diff 15391!Aug 5 2022, 5:17 PM
atul requested changes to this revision.Aug 8 2022, 10:40 AM
This comment was removed by atul.
This revision now requires changes to proceed.Aug 8 2022, 10:40 AM
atul accepted this revision.Aug 8 2022, 10:43 AM

Sorry just checked and looks like the Test Plan here continues to work, intended to request changes on D4762

This revision is now accepted and ready to land.Aug 8 2022, 10:43 AM
• jon mentioned this in rCOMMe2e9907eb4fc: [Services] Update tunnelbroker Dockerfile & cmake.Aug 8 2022, 11:34 AM
• jon updated this revision to Diff 15440.Aug 8 2022, 11:42 AM

Merge mac fixes into this diff to ease review

Harbormaster failed remote builds in B11222: Diff 15440!Aug 8 2022, 11:44 AM
This revision was landed with ongoing or failed builds.Aug 8 2022, 1:45 PM
Closed by commit rCOMMc11d07fedc73: [Services] Update blob CMake project (authored by • jon). · Explain Why
This revision was automatically updated to reflect the committed changes.
• jon mentioned this in rCOMM2d5c710211a1: [Services] Export shared services cpp as CMake Project.
• jon added a commit: rCOMMc11d07fedc73: [Services] Update blob CMake project.
• karol mentioned this in D4895: [services] Blob - Fix Dockerfile.Aug 22 2022, 6:14 AM
• karol mentioned this in rCOMM25f32c8b3729: [services] Blob - Fix Dockerfile.Aug 24 2022, 4:17 AM
• jon mentioned this in D5120: [Chore] Cleanup blob CMakeLists.txt.Sep 12 2022, 1:51 PM
• jon mentioned this in rCOMMdcc1dc7431e6: [Chore] Cleanup blob CMakeLists.txt.Sep 13 2022, 11:45 AM

Revision Contents
Changeset List

PathSize
services/
blob/
62 lines
src/
4 lines
DatabaseEntities/
2 lines
Reactors/
server/
6 lines
1 line

Diff 14906

View Options

services/blob/CMakeLists.txt

Loading...
View Options

services/blob/src/BlobServiceImpl.h

Loading...
View Options

services/blob/src/DatabaseEntities/DatabaseEntitiesTools.h

Loading...
View Options

services/blob/src/DatabaseManager.h

Loading...
View Options

services/blob/src/Reactors/server/GetReactor.h

Loading...
View Options

services/blob/src/Tools.h

Loading...