From 7d832097302df5773f6c2c7ab87101c812aa978f Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Fri, 13 Feb 2026 19:22:32 +0100 Subject: [PATCH] Output both esp32 and esp32s3 builds --- .github/workflows/linux.yml | 6 +++--- .github/workflows/macos.yml | 30 +++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e40d5f33..7a9d1d47 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -58,7 +58,7 @@ jobs: - name: Install additional MicroPythonOS dependencies run: | sudo apt-get update - sudo apt-get install -y libv4l-dev librlottie-dev + sudo apt-get install -y libv4l-dev - name: Extract OS version id: version @@ -118,14 +118,14 @@ jobs: - name: Upload built binary as artifact uses: actions/upload-artifact@v4 with: - name: MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin + name: MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.bin path: lvgl_micropython/build/MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.bin retention-days: 7 - name: Upload built binary as artifact uses: actions/upload-artifact@v4 with: - name: MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota + name: MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.ota path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.ota retention-days: 7 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0dbdf7e0..2876bd67 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -56,34 +56,46 @@ jobs: with: name: MicroPythonOS_amd64_macOS_${{ steps.version.outputs.OS_VERSION }}.bin path: lvgl_micropython/build/MicroPythonOS_amd64_macOS_${{ steps.version.outputs.OS_VERSION }}.bin - compression-level: 0 # don't zip it retention-days: 7 + - name: Build LVGL MicroPython esp32 run: | ./scripts/build_mpos.sh esp32 - mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin lvgl_micropython/build/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin - mv lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota + mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC-SPIRAM-16.bin lvgl_micropython/build/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin + mv lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC-SPIRAM/micropython.bin lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC-SPIRAM/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota - name: Upload built binary as artifact uses: actions/upload-artifact@v4 with: name: MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin path: lvgl_micropython/build/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin - compression-level: 0 # don't zip it retention-days: 7 - name: Upload built binary as artifact uses: actions/upload-artifact@v4 with: name: MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota - path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota - compression-level: 0 # don't zip it + path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC-SPIRAM/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota retention-days: 7 - - name: Cleanup + + - name: Build LVGL MicroPython esp32s3 run: | - rm lvgl_micropython/build/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin - rm lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota + ./scripts/build_mpos.sh esp32s3 + mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin lvgl_micropython/build/MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.bin + mv lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.ota + - name: Upload built binary as artifact + uses: actions/upload-artifact@v4 + with: + name: MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.bin + path: lvgl_micropython/build/MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.bin + retention-days: 7 + - name: Upload built binary as artifact + uses: actions/upload-artifact@v4 + with: + name: MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.ota + path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_esp32s3_${{ steps.version.outputs.OS_VERSION }}.ota + retention-days: 7