From b6ddbd0087dce616ed53b9088b0e09970a9c045e Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sat, 18 Nov 2023 11:04:21 -0600
Subject: [PATCH] More CI work for Raspbian (#2949)

* More CI work for Raspbian

* Workaround quirks of Arm64/debian runners
---
 .github/workflows/build_raspbian.yml | 24 +++++++++++++++++++-----
 .github/workflows/main_matrix.yml    | 10 ++++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_raspbian.yml b/.github/workflows/build_raspbian.yml
index 1860e9098..78122cb35 100644
--- a/.github/workflows/build_raspbian.yml
+++ b/.github/workflows/build_raspbian.yml
@@ -10,10 +10,24 @@ jobs:
   build-raspbian:
     runs-on: [self-hosted, linux, ARM64]
     steps:
-      - uses: actions/checkout@v3
-      - name: Build base
-        id: base
-        uses: ./.github/actions/setup-base
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Upgrade python tools
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio adafruit-nrfutil
+          pip install -U meshtastic --pre
+
+      - name: Upgrade platformio
+        shell: bash
+        run: |
+          pio upgrade
 
       - name: Build Raspbian
         run: bin/build-native.sh
@@ -25,6 +39,6 @@ jobs:
       - name: Store binaries as an artifact
         uses: actions/upload-artifact@v3
         with:
-          name: firmware-native-${{ steps.version.outputs.version }}.zip
+          name: firmware-raspbian-${{ steps.version.outputs.version }}.zip
           path: |
             release/meshtasticd_linux_arm64
diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index bd024b0af..259306f0c 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -103,7 +103,6 @@ jobs:
   build-nrf52:
     strategy:
       fail-fast: false
-      max-parallel: 2
       matrix:
         include:
           - board: rak4631
@@ -210,7 +209,14 @@ jobs:
   gather-artifacts:
     runs-on: ubuntu-latest
     needs:
-      [build-esp32, build-esp32-s3, build-nrf52, build-native, build-rpi2040]
+      [
+        build-esp32,
+        build-esp32-s3,
+        build-nrf52,
+        build-raspbian,
+        build-native,
+        build-rpi2040,
+      ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3