From b53f9f847720bd7d7472b5709c8befc82f5ae401 Mon Sep 17 00:00:00 2001
From: Stefo <stefo@stefo.pl>
Date: Sun, 28 Apr 2024 12:41:49 +0200
Subject: [PATCH 1/2] Fix mate71pl/mmrelaynode/#11 Build problem Fixed
 compilation errors, missing dependencies, and corrected file path

---
 .github/workflows/main.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0f2889e..0f06373 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -19,10 +19,10 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get -y install wget g++ zip ca-certificates
+          sudo apt-get -y install wget g++ zip ca-certificates cmake libyaml-cpp-dev libgpiod-dev libbluetooth-dev
           pip install --upgrade pip
           pip install platformio
-          
+
       - name: Clone Meshtastic repository and compile firmware
         run: |
           git clone https://github.com/meshtastic/firmware --recurse-submodules /tmp/firmware
@@ -32,13 +32,15 @@ jobs:
           # Extract tag from version.properties 
           TAG=$(curl -s https://raw.githubusercontent.com/meshtastic/firmware/master/version.properties | sed -nE 's/major = ([0-9]+)/\1./p; s/minor = ([0-9]+)/\1./p; s/build = ([0-9]+)/\1/p' | tr -d '\n'; echo)
           echo "TAG=amd64-v$TAG" >> $GITHUB_ENV  # Set variable for next steps
-          
+      - name: Display directory structure
+        run: |
+          tree /tmp/firmware/release
       - name: Upload firmware to release
         id: upload-release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: /tmp/firmware/release/meshtasticd_linux_amd64
+          file: /tmp/firmware/release/meshtasticd_linux_x86_64
           asset_name: meshtasticd_linux_amd64
           tag: ${{ env.TAG }}
           overwrite: true

From fa59f4fbcd3420d64b7e02b159ba80a8c417cbd1 Mon Sep 17 00:00:00 2001
From: Stefo <stefo@stefo.pl>
Date: Mon, 29 Apr 2024 12:44:03 +0200
Subject: [PATCH 2/2] Add necessary libs to Dockerfile

---
 device/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/device/Dockerfile b/device/Dockerfile
index 4d35fd0..13531c6 100644
--- a/device/Dockerfile
+++ b/device/Dockerfile
@@ -1,8 +1,9 @@
 FROM debian:bookworm-slim AS device
 LABEL "website"="https://github.com/mate-dev/mmrelaynode"
-RUN apt-get update && apt-get install g++ -y
+RUN apt-get update && apt-get -y install wget python3 g++ zip python3-venv git vim ca-certificates libgpiod-dev libyaml-cpp-dev libbluetooth-dev
 WORKDIR /bin
 ADD https://github.com/mate-dev/mmrelaynode/releases/latest/download/meshtasticd_linux_amd64 /bin/meshtasticd
 RUN chmod +x meshtasticd 
 EXPOSE 4403
-ENTRYPOINT [ "sh", "-c", "meshtasticd" ]
\ No newline at end of file
+ENTRYPOINT [ "sh", "-c", "meshtasticd" ]
+HEALTHCHECK NONE
\ No newline at end of file