From 7979dce3661518a3f06a62b7ddbc22d54fdad9fa Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 27 Jul 2024 06:29:05 -0500
Subject: [PATCH 1/2] Enable stm32 builds and wio-e5 board

---
 .github/workflows/build_stm32.yml | 33 +++++++++++++++++++++++++++++++
 .github/workflows/main_matrix.yml | 10 ++++++++++
 bin/build-stm32.sh                | 29 +++++++++++++++++++++++++++
 variants/wio-e5/platformio.ini    |  1 -
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/build_stm32.yml
 create mode 100644 bin/build-stm32.sh

diff --git a/.github/workflows/build_stm32.yml b/.github/workflows/build_stm32.yml
new file mode 100644
index 0000000000..d13c52c8a1
--- /dev/null
+++ b/.github/workflows/build_stm32.yml
@@ -0,0 +1,33 @@
+name: Build STM32
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+jobs:
+  build-stm32:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
+
+      - name: Build STM32
+        run: bin/build-stm32.sh ${{ inputs.board }}
+
+      - name: Get release version string
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
+          overwrite: true
+          path: |
+            release/*.hex
+            release/*.bin
diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 14c8a9d10c..b1d1d307a1 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -41,6 +41,7 @@ jobs:
       esp32c3: ${{ steps.jsonStep.outputs.esp32c3 }}
       nrf52840: ${{ steps.jsonStep.outputs.nrf52840 }}
       rp2040: ${{ steps.jsonStep.outputs.rp2040 }}
+      stm32: ${{ steps.jsonStep.outputs.stm32 }}
       check: ${{ steps.jsonStep.outputs.check }}
 
   check:
@@ -103,6 +104,15 @@ jobs:
     with:
       board: ${{ matrix.board }}
 
+  build-stm32:
+    needs: setup
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.stm32) }}
+    uses: ./.github/workflows/build_stm32.yml
+    with:
+      board: ${{ matrix.board }}
+
   package-raspbian:
     uses: ./.github/workflows/package_raspbian.yml
 
diff --git a/bin/build-stm32.sh b/bin/build-stm32.sh
new file mode 100644
index 0000000000..30b505c001
--- /dev/null
+++ b/bin/build-stm32.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+
+VERSION=$(bin/buildinfo.py long)
+SHORT_VERSION=$(bin/buildinfo.py short)
+
+OUTDIR=release/
+
+rm -f $OUTDIR/firmware*
+rm -r $OUTDIR/* || true
+
+# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
+platformio pkg update
+
+echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
+rm -f .pio/build/$1/firmware.*
+
+# The shell vars the build tool expects to find
+export APP_VERSION=$VERSION
+
+basename=firmware-$1-$VERSION
+
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
+
+SRCELF=.pio/build/$1/firmware.bin
+cp $SRCHEX $OUTDIR/$basename.bin
diff --git a/variants/wio-e5/platformio.ini b/variants/wio-e5/platformio.ini
index 12cd6190d2..51591d5696 100644
--- a/variants/wio-e5/platformio.ini
+++ b/variants/wio-e5/platformio.ini
@@ -1,6 +1,5 @@
 [env:wio-e5]
 extends = stm32_base
-board_level = extra
 board = lora_e5_dev_board
 build_flags =
   ${stm32_base.build_flags}

From 4d9d668434e006e791f6a689162891140afb8de9 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 27 Jul 2024 06:37:41 -0500
Subject: [PATCH 2/2] Chmod

---
 bin/build-stm32.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 bin/build-stm32.sh

diff --git a/bin/build-stm32.sh b/bin/build-stm32.sh
old mode 100644
new mode 100755
index 30b505c001..9e813a8c09
--- a/bin/build-stm32.sh
+++ b/bin/build-stm32.sh
@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update
+platformio pkg update -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*