From 6927b40d7fa2e1eae9f0c154a61ff99f773087f0 Mon Sep 17 00:00:00 2001
From: Christopher Nadler <christopher.nadler@gmail.com>
Date: Mon, 14 Oct 2024 04:08:32 +0000
Subject: [PATCH] Try vfs_merge

---
 .github/workflows/ESP32.yml | 43 +++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ESP32.yml b/.github/workflows/ESP32.yml
index a04a83c..393104f 100644
--- a/.github/workflows/ESP32.yml
+++ b/.github/workflows/ESP32.yml
@@ -95,25 +95,25 @@ jobs:
           - ESP32_GENERIC_S3
           - ESP32_GENERIC_S3-SPIRAM_OCT
           - ESP32_GENERIC_S3-FLASH_4M
-          - ESP32_GENERIC-SPIRAM@WROVER_KIT
-          - ESP32_GENERIC-SPIRAM@ESP_EYE
-          - ESP32_GENERIC-SPIRAM@M5STACK_PSRAM
-          - ESP32_GENERIC-SPIRAM@M5STACK_V2_PSRAM
-          - ESP32_GENERIC-SPIRAM@M5STACK_WIDE
-          - ESP32_GENERIC-SPIRAM@M5STACK_ESP32CAM
-          - ESP32_GENERIC-SPIRAM@M5STACK_UNITCAM
-          - ESP32_GENERIC-SPIRAM@AI_THINKER
-          - ESP32_GENERIC-SPIRAM@TTGO_T_JOURNAL
-          - ESP32_GENERIC-SPIRAM@TTGO_T_CAMERA_PLUS
-          - ESP32_GENERIC_S3-SPIRAM_OCT@M5STACK_CAMS3_UNIT
-          - ESP32_GENERIC_S3-SPIRAM_OCT@XIAO_ESP32S3
-          - ESP32_GENERIC_S3-SPIRAM_OCT@ESP32S3_CAM_LCD
-          - ESP32_GENERIC_S3-SPIRAM_OCT@ESP32S3_EYE
-          - ESP32_GENERIC_S3-SPIRAM_OCT@FREENOVE_ESP32S3_CAM
-          - ESP32_GENERIC_S3-SPIRAM_OCT@DFRobot_FireBeetle2_ESP32S3
-          - ESP32_GENERIC_S3-SPIRAM_OCT@DFRobot_Romeo_ESP32S3
-          - ESP32_GENERIC_S3-SPIRAM_OCT@NEW_ESPS3_RE1_0
-          - ESP32_GENERIC_S3-SPIRAM_OCT@XENOIONEX
+          # - ESP32_GENERIC-SPIRAM@WROVER_KIT
+          # - ESP32_GENERIC-SPIRAM@ESP_EYE
+          # - ESP32_GENERIC-SPIRAM@M5STACK_PSRAM
+          # - ESP32_GENERIC-SPIRAM@M5STACK_V2_PSRAM
+          # - ESP32_GENERIC-SPIRAM@M5STACK_WIDE
+          # - ESP32_GENERIC-SPIRAM@M5STACK_ESP32CAM
+          # - ESP32_GENERIC-SPIRAM@M5STACK_UNITCAM
+          # - ESP32_GENERIC-SPIRAM@AI_THINKER
+          # - ESP32_GENERIC-SPIRAM@TTGO_T_JOURNAL
+          # - ESP32_GENERIC-SPIRAM@TTGO_T_CAMERA_PLUS
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@M5STACK_CAMS3_UNIT
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@XIAO_ESP32S3
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@ESP32S3_CAM_LCD
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@ESP32S3_EYE
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@FREENOVE_ESP32S3_CAM
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@DFRobot_FireBeetle2_ESP32S3
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@DFRobot_Romeo_ESP32S3
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@NEW_ESPS3_RE1_0
+          # - ESP32_GENERIC_S3-SPIRAM_OCT@XENOIONEX
 
     steps:
      # Get the latest MicroPython release
@@ -172,6 +172,11 @@ jobs:
           mkdir -p ~/artifacts
           mv ~/micropython/ports/esp32/build-${BUILD_TARGET}/firmware.bin ~/artifacts/firmware.bin
 
+      - name: Write files to binary image
+        run: |
+          pip install vfs_merge
+          vfsmerge --port auto --firmware ~/micropython/ports/esp32/build-${BUILD_TARGET}/firmware.bin --source {{ github.workspace }}/examples --build ~/artifacts/firmware2.bin
+
       - name: Upload firmware artifact
         uses: actions/upload-artifact@v4
         with: