diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e26e3b1e..3bcafce5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,15 +15,6 @@ jobs: with: submodules: recursive - - name: Fetch tags for lib/SDL - run: | - # Unshallow a specific submodule (fetches full history) - cd lvgl_micropython/lib/SDL - git fetch --unshallow origin - # Or fetch all refs without unshallowing (keeps it shallow but adds refs) - git fetch origin 'refs/*:refs/*' - cd ../../.. - - name: Install dependencies run: | sudo apt-get update @@ -61,7 +52,7 @@ jobs: libdecor-0-dev \ git - - name: Build LVGL MicroPython + - name: Build LVGL MicroPython for unix dev run: | ./scripts/build_lvgl_micropython.sh unix dev @@ -71,3 +62,26 @@ jobs: name: lvgl_micropy_unix path: lvgl_micropython/build/lvgl_micropy_unix retention-days: 7 # Adjust as needed; artifacts can be downloaded from the workflow run summary + + - name: Build LVGL MicroPython esp32 prod fri3d-2024 + run: | + ./scripts/build_lvgl_micropython.sh esp32 prod fri3d-2024 + + - name: Upload built binary as artifact + uses: actions/upload-artifact@v4 + with: + name: MicroPythonOS_fri3d-2024_prod + path: lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin + retention-days: 7 # Adjust as needed; artifacts can be downloaded from the workflow run summary + + + - name: Build LVGL MicroPython esp32 prod fri3d-2024 + run: | + ./scripts/build_lvgl_micropython.sh esp32 dev fri3d-2024 + + - name: Upload built binary as artifact + uses: actions/upload-artifact@v4 + with: + name: MicroPythonOS_fri3d-2024_dev + path: lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin + retention-days: 7 # Adjust as needed; artifacts can be downloaded from the workflow run summary diff --git a/scripts/build_lvgl_micropython.sh b/scripts/build_lvgl_micropython.sh index dcf902a1..9e2a5a9e 100755 --- a/scripts/build_lvgl_micropython.sh +++ b/scripts/build_lvgl_micropython.sh @@ -34,7 +34,7 @@ popd echo "Check need to add esp32-camera..." idfile="$codebasedir"/lvgl_micropython/lib/micropython/ports/esp32/main/idf_component.yml -if grep -v esp32-camera "$idfile"; then +if ! grep esp32-camera "$idfile"; then echo "Adding esp32-camera to $idfile" echo " espressif/esp32-camera: git: https://github.com/MicroPythonOS/esp32-camera" >> "$idfile" @@ -44,7 +44,7 @@ fi echo "Check need to add asyncio..." manifile="$codebasedir"/lib/micropython/ports/unix/variants/manifest.py -if grep -v asyncio "$manifile"; then +if ! grep asyncio "$manifile"; then echo "Adding asyncio to $manifile" echo 'include("$(MPY_DIR)/extmod/asyncio") # needed to have asyncio, which is used by aiohttp, which has used by websockets' >> "$manifile" else