fix: prevent future merge from upstream conflicts

.github/workflows/build-companion-firmwares.yml

@@ -0,0 +1,42 @@
+name: Build Companion Firmwares
+
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'companion-*'
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Build Firmwares
+        env:
+          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
+        run: /usr/bin/env bash build.sh build-companion-firmwares
+
+      - name: Upload Workflow Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: companion-firmwares
+          path: out
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          name: Companion Firmware ${{ env.GIT_TAG_VERSION }}
+          body: ""
+          draft: true
+          files: out/*

.github/workflows/build-repeater-firmwares.yml

@@ -0,0 +1,42 @@
+name: Build Repeater Firmwares
+
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'repeater-*'
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Build Firmwares
+        env:
+          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
+        run: /usr/bin/env bash build.sh build-repeater-firmwares
+
+      - name: Upload Workflow Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: repeater-firmwares
+          path: out
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          name: Repeater Firmware ${{ env.GIT_TAG_VERSION }}
+          body: ""
+          draft: true
+          files: out/*

.github/workflows/build-room-server-firmwares.yml

@@ -0,0 +1,42 @@
+name: Build Room Server Firmwares
+
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'room-server-*'
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Build Firmwares
+        env:
+          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
+        run: /usr/bin/env bash build.sh build-room-server-firmwares
+
+      - name: Upload Workflow Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: room-server-firmwares
+          path: out
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          name: Room Server Firmware ${{ env.GIT_TAG_VERSION }}
+          body: ""
+          draft: true
+          files: out/*

.github/workflows/eastmesh-build-companion-wifi-firmwares.yml

@@ -1,4 +1,4 @@
-name: Build Companion WiFi Firmwares
+name: EastMesh Build Companion WiFi Firmwares
 
 permissions:
   contents: write

.github/workflows/eastmesh-build-repeater-mqtt-firmwares.yml

@@ -1,4 +1,4 @@
-name: Build Repeater MQTT Firmwares
+name: EastMesh Build Repeater MQTT Firmwares
 
 permissions:
   contents: write

.github/workflows/eastmesh-github-pages.yml

@@ -0,0 +1,42 @@
+name: EastMesh Build and deploy Docs site to GitHub Pages
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+
+jobs:
+  github-pages:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v6.0.2
+
+      - name: Setup Python
+        uses: actions/setup-python@v6.2.0
+        with:
+          python-version: "3.11"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v8.0.0
+
+      - name: Sync Docs Tooling
+        run: uv sync --locked --group docs
+
+      - name: Build
+        run: uv run --group docs zensical build
+
+      - name: Write CNAME
+        if: ${{ vars.PAGES_CNAME != '' }}
+        run: printf '%s\n' "${{ vars.PAGES_CNAME }}" > site/CNAME
+
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v4.0.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./site
+          publish_branch: "gh-pages"

.github/workflows/eastmesh-pr-build-check.yml

@@ -0,0 +1,39 @@
+name: EastMesh PR Build Check
+
+on:
+  pull_request:
+    branches: [ main ]
+    paths:
+      - "src/**"
+      - "examples/**"
+      - "variants/**"
+      - "platformio.ini"
+      - ".github/workflows/eastmesh-pr-build-check.yml"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      OFFICIAL_MESHCORE_VERSION: ${{ vars.OFFICIAL_MESHCORE_VERSION }}
+      PLATFORMIO_BUILD_FLAGS: -UMQTT_DEBUG
+    strategy:
+      fail-fast: false
+      matrix:
+        environment:
+          # ESP32-S3 / core EastMesh targets
+          - heltec_v4_companion_radio_wifi
+          - heltec_v4_repeater_mqtt
+          - LilyGo_TBeam_1W_companion_radio_wifi
+          - LilyGo_TBeam_1W_repeater_mqtt
+          - T_Beam_S3_Supreme_SX1262_companion_radio_wifi
+          - T_Beam_S3_Supreme_SX1262_repeater_mqtt
+
+    steps:
+      - name: Clone Repo
+        uses: actions/checkout@v6
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Build ${{ matrix.environment }}
+        run: pio run -e ${{ matrix.environment }}

.github/workflows/eastmesh-push-build-check.yml

@@ -1,4 +1,4 @@
-name: PUSH Build Check
+name: EastMesh PUSH Build Check
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
       - "examples/**"
       - "variants/**"
       - "platformio.ini"
-      - ".github/workflows/push-build-check.yml"
+      - ".github/workflows/eastmesh-push-build-check.yml"
 
 jobs:
   build:

.github/workflows/github-pages.yml

@@ -13,30 +13,24 @@ jobs:
   github-pages:
     runs-on: ubuntu-latest
     steps:
+
       - name: Checkout Repo
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v8.0.0
-
-      - name: Sync Docs Tooling
-        run: uv sync --locked --group docs
+          ruby-version: 3.x
 
       - name: Build
-        run: uv run --group docs zensical build
-
-      - name: Write CNAME
-        if: ${{ vars.PAGES_CNAME != '' }}
-        run: printf '%s\n' "${{ vars.PAGES_CNAME }}" > site/CNAME
+        run: |
+          pip install mkdocs-material
+          mkdocs build
 
       - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v4.0.0
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
+          cname: docs.meshcore.io
           publish_dir: ./site
-          publish_branch: "gh-pages"
+          publish_branch: 'gh-pages'

.github/workflows/pr-build-check.yml

@@ -2,35 +2,51 @@ name: PR Build Check
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main, dev]
     paths:
-      - "src/**"
-      - "examples/**"
-      - "variants/**"
-      - "platformio.ini"
-      - ".github/workflows/pr-build-check.yml"
+      - 'src/**'
+      - 'examples/**'
+      - 'variants/**'
+      - 'platformio.ini'
+      - '.github/workflows/pr-build-check.yml'
+  push:
+    branches: [main, dev]
+    paths:
+      - 'src/**'
+      - 'examples/**'
+      - 'variants/**'
+      - 'platformio.ini'
+      - '.github/workflows/pr-build-check.yml'
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      OFFICIAL_MESHCORE_VERSION: ${{ vars.OFFICIAL_MESHCORE_VERSION }}
-      PLATFORMIO_BUILD_FLAGS: -UMQTT_DEBUG
     strategy:
       fail-fast: false
       matrix:
         environment:
-          # ESP32-S3 / core EastMesh targets
-          - heltec_v4_companion_radio_wifi
-          - heltec_v4_repeater_mqtt
-          - LilyGo_TBeam_1W_companion_radio_wifi
-          - LilyGo_TBeam_1W_repeater_mqtt
-          - T_Beam_S3_Supreme_SX1262_companion_radio_wifi
-          - T_Beam_S3_Supreme_SX1262_repeater_mqtt
+          # ESP32-S3 (most common platform)
+          - Heltec_v3_companion_radio_ble
+          - Heltec_v3_repeater
+          - Heltec_v3_room_server
+          # nRF52
+          - RAK_4631_companion_radio_ble
+          - RAK_4631_repeater
+          - RAK_4631_room_server
+          # RP2040
+          - PicoW_repeater
+          # STM32
+          - wio-e5-mini_repeater
+          # ESP32-C6
+          - LilyGo_Tlora_C6_repeater_
+          # LR1110 (nRF52)
+          - wio_wm1110_repeater
+          # SX1276 (ESP32)
+          - Tbeam_SX1276_repeater
 
     steps:
       - name: Clone Repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup Build Environment
         uses: ./.github/actions/setup-build-environment