Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add alpine-edge target #111

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

add alpine-edge target #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c5066
add alpine-edge build target
Habbie Sep 2, 2024
d50350e
disable UIApexCard for now, it is unhappy here
Habbie Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ if get_option('front-lvgl').enabled()
'src/uicomponents/imgs/white24.c',
'src/uicomponents/uirgblight.cpp',
'src/uicomponents/UILogBox.cpp',
'src/uicomponents/uiapexcard.cpp',
# 'src/uicomponents/uiapexcard.cpp',
'src/uicomponents/UIComponents.cpp',
'src/front-lvgl.cpp',
'src/lv_conf.h',
Expand Down
3 changes: 3 additions & 0 deletions scripts/build-targets/Dockerfile.alpine-edge
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM alpine:edge
RUN apk add alpine-sdk git cmake ninja-build nlohmann-json openssl-dev meson zlib-dev linux-headers
RUN git config --global --add safe.directory '*' # this makes meson's vcs_tag() work
3 changes: 3 additions & 0 deletions scripts/build-targets/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ all: armel

armel:
docker build -f Dockerfile.armel -t voorkant-builder:armel .

alpine-edge:
docker build -f Dockerfile.alpine-edge -t voorkant-builder:alpine-edge .
10 changes: 5 additions & 5 deletions src/front-lvgl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,12 @@ void uithread(int _argc, char* _argv[])
g_log << Logger::Warning << "Card is of type button, but no entity found: " << card << std::endl;
}
}
else if (card["type"] == "custom:apexcharts-card") {
// else if (card["type"] == "custom:apexcharts-card") {

std::unique_ptr<UIEntity> apex = std::make_unique<UIApexCard>(card, cont_row);
uielements.push_back(std::move(apex));
g_log << Logger::Warning << "got apex card" << std::endl;
}
// std::unique_ptr<UIEntity> apex = std::make_unique<UIApexCard>(card, cont_row);
// uielements.push_back(std::move(apex));
// g_log << Logger::Warning << "got apex card" << std::endl;
// }
else {
if (card.contains(("entity"))) {
g_log << Logger::Warning << "Card of type " << card["type"] << " found, but we have no matching UIEntity. Creating dummy for entity." << card["entity"] << std::endl;
Expand Down
Loading