Skip to content

Commit

Permalink
Merge pull request #12 from stefopl/mmrelaynode-11
Browse files Browse the repository at this point in the history
Fix mate71pl/mmrelaynode/#11 Build problem
  • Loading branch information
mate71pl authored Apr 29, 2024
2 parents 49cdbac + fa59f4f commit a8a9995
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand All @@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions device/Dockerfile
Original file line number Diff line number Diff line change
@@ -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" ]
ENTRYPOINT [ "sh", "-c", "meshtasticd" ]
HEALTHCHECK NONE

0 comments on commit a8a9995

Please sign in to comment.