From c979d1a191818a8a507e7cb8f5b5a6635a2cc6ab Mon Sep 17 00:00:00 2001
From: Mathieu Carbou <mathieu.carbou@gmail.com>
Date: Thu, 27 Feb 2025 23:36:18 +0100
Subject: [PATCH] Fix CI

---
 .github/workflows/build-arduino.yml    | 42 ++++++-------------------
 .github/workflows/build-pioarduino.yml | 43 ++------------------------
 platformio.ini                         |  2 +-
 3 files changed, 12 insertions(+), 75 deletions(-)

diff --git a/.github/workflows/build-arduino.yml b/.github/workflows/build-arduino.yml
index 52df9526..9454a55a 100644
--- a/.github/workflows/build-arduino.yml
+++ b/.github/workflows/build-arduino.yml
@@ -108,40 +108,16 @@ jobs:
             arduino-cli compile --library . --warnings none -b esp8266:esp8266:huzzah "examples/$i/$i.ino"
           done
 
-  arduino-rp2040:
-    name: Arduino RP2040
+  arduino-rpi:
+    name: Arduino RPI
     runs-on: ubuntu-latest
-    steps:
-      - name: Install arduino-cli
-        run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh
-
-      - name: Update core index
-        run: arduino-cli core update-index --additional-urls https://github.com/earlephilhower/arduino-pico/releases/download/4.4.3/package_rp2040_index.json
-
-      - name: Install core
-        run: arduino-cli core install --additional-urls https://github.com/earlephilhower/arduino-pico/releases/download/4.4.3/package_rp2040_index.json rp2040:rp2040
+    strategy:
+      fail-fast: false
+      matrix:
+        board:
+          - rpipicow
+          - rpipico2w
 
-      - name: Install ArduinoJson
-        run: arduino-cli lib install ArduinoJson
-
-      - name: Install RPAsyncTCP
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ayushsharma82/RPAsyncTCP#v1.3.0
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build Examples
-        run: |
-          for i in `ls examples`; do
-            echo "============================================================="
-            echo "Building examples/$i..."
-            echo "============================================================="
-            arduino-cli compile --library . --warnings none -b rp2040:rp2040:rpipicow "examples/$i/$i.ino"
-          done
-
-  arduino-rp2350:
-    name: Arduino RP2350
-    runs-on: ubuntu-latest
     steps:
       - name: Install arduino-cli
         run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh
@@ -167,5 +143,5 @@ jobs:
             echo "============================================================="
             echo "Building examples/$i..."
             echo "============================================================="
-            arduino-cli compile --library . --warnings none -b rp2040:rp2040:rpipico2w "examples/$i/$i.ino"
+            arduino-cli compile --library . --warnings none -b rp2040:rp2040:${{ matrix.board }} "examples/$i/$i.ino"
           done
diff --git a/.github/workflows/build-pioarduino.yml b/.github/workflows/build-pioarduino.yml
index 56d7fd9c..89158b57 100644
--- a/.github/workflows/build-pioarduino.yml
+++ b/.github/workflows/build-pioarduino.yml
@@ -185,53 +185,14 @@ jobs:
             PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-esp8266
           done
 
-  platformio-rp2040:
-    name: PIO RP2040
+  platformio-rpi:
+    name: PIO RPI
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         board:
           - rpipicow
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Cache PlatformIO
-        uses: actions/cache@v4
-        with:
-          key: ${{ runner.os }}-pio
-          path: |
-            ~/.cache/pip
-            ~/.platformio
-
-      - name: Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: Install PIO
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade platformio
-
-      - name: Build Examples
-        run: |
-          for i in `ls examples`; do
-            echo "============================================================="
-            echo "Building examples/$i..."
-            echo "============================================================="
-            PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-raspberrypi
-          done
-
-  platformio-rp2350:
-    name: PIO RP2350
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        board:
           - rpipico2w
 
     steps:
diff --git a/platformio.ini b/platformio.ini
index dd2c14ed..9103159f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -131,7 +131,7 @@ lib_deps =
   ESP32Async/ESPAsyncTCP @ 2.0.0
 
 [env:ci-raspberrypi]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#4d1acd7caac8c055c05f5ac6c68fa5f079730947
 board = ${sysenv.PIO_BOARD}
 board_build.core = earlephilhower
 lib_deps =