This repository has been archived by the owner on May 21, 2024. It is now read-only.
Put aktualizr-cert-provider in garage_deploy.deb #1218
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lbonn
force-pushed
the
feat/akt-cert-provider-pkg
branch
from
05e532e to
dde9584
Compare
|
Seems reasonable at a quick glance, provided you can fix the CI. |
pattivacek
reviewed
May 28, 2019
CMakeLists.txt
Outdated
| @@ -334,7 +334,7 @@ add_library(jsoncpp OBJECT third_party/jsoncpp/jsoncpp.cpp) | |||
|
|
|||
| # General packaging configuration | |||
| set(CPACK_GENERATOR "DEB") | |||
| set(CPACK_DEBIAN_PACKAGE_MAINTAINER "anton.gerasimov@here.com") | |||
| set(CPACK_DEBIAN_PACKAGE_MAINTAINER "patrick.vacek@here.com") | |||
There was a problem hiding this comment.
maybe I should have asked you before indeed, sorry
There was a problem hiding this comment.
It's fine! I was just amused.
| @@ -8,9 +8,11 @@ set(HEADERS packagemanagerconfig.h | |||
| packagemanagerfake.h | |||
| packagemanagerinterface.h) | |||
|
|
|||
| add_library(package_manager OBJECT ${SOURCES}) | |||
| add_library(package_manager OBJECT packagemanagerfactory.cc packagemanagerfake.cc packagemanagerinterface.cc) | |||
There was a problem hiding this comment.
This is a bit less than ideal; should we instead remove packagemanagerconfig.cc from SOURCES?
|
Hm yes I really don't know what's going on with CI, that's quite annoying. |
lbonn
force-pushed
the
feat/akt-cert-provider-pkg
branch
from
dde9584 to
5cc52d1
Compare
Codecov Report
@@ Coverage Diff @@
## master #1218 +/- ##
==========================================
+ Coverage 79.35% 79.51% +0.15%
==========================================
Files 168 170 +2
Lines 10029 10028 -1
==========================================
+ Hits 7959 7974 +15
+ Misses 2070 2054 -16
Continue to review full report at Codecov.
|
This way, we avoid having to pull every full library when linking with config. Signed-off-by: Laurent Bonnans <[email protected]>
Signed-off-by: Laurent Bonnans <[email protected]>
Signed-off-by: Laurent Bonnans <[email protected]>
lbonn
force-pushed
the
feat/akt-cert-provider-pkg
branch
from
3314db3 to
663f655
Compare
pattivacek
approved these changes
May 31, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For convenience