From 90164b272eb49f8fc0006769bdee6701ddd4716f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 13 Apr 2026 22:00:17 +0200 Subject: [PATCH] fix trixie image and test env --- .github/actions/setup-base/action.yml | 2 +- Dockerfile | 2 +- src/serialization/MeshPacketSerializer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-base/action.yml b/.github/actions/setup-base/action.yml index 8e461998a..21d87ad07 100644 --- a/.github/actions/setup-base/action.yml +++ b/.github/actions/setup-base/action.yml @@ -13,7 +13,7 @@ runs: shell: bash run: | sudo apt-get -y update --fix-missing - sudo apt-get install -y cppcheck libbluetooth-dev libgpiod-dev libyaml-cpp-dev lsb-release + sudo apt-get install -y cppcheck libbluetooth-dev libgpiod-dev libyaml-cpp-dev libjsoncpp-dev lsb-release - name: Setup Python uses: actions/setup-python@v6 diff --git a/Dockerfile b/Dockerfile index 01f1b3540..900a0c428 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ ENV TZ=Etc/UTC USER root RUN apt-get update && apt-get --no-install-recommends -y install \ - libc-bin libc6 libgpiod3 libyaml-cpp0.8 libjsoncpp25 libi2c0 libuv1t64 libusb-1.0-0-dev \ + libc-bin libc6 libgpiod3 libyaml-cpp0.8 libjsoncpp26 libi2c0 libuv1t64 libusb-1.0-0-dev \ liborcania2.3 libulfius2.7t64 libssl3t64 \ libx11-6 libinput10 libxkbcommon-x11-0 libsdl2-2.0-0 \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ diff --git a/src/serialization/MeshPacketSerializer.cpp b/src/serialization/MeshPacketSerializer.cpp index c440902a3..e017d004c 100644 --- a/src/serialization/MeshPacketSerializer.cpp +++ b/src/serialization/MeshPacketSerializer.cpp @@ -6,8 +6,8 @@ #include "modules/RoutingModule.h" #include #include -#include #include +#include #if defined(ARCH_ESP32) #include "../mesh/generated/meshtastic/paxcount.pb.h" #endif