updates unix CI

Author: kdschlosser

.github/workflows/unix.yml

@@ -2,8 +2,6 @@
 
 name: Unix build
 
-
-
 on:
   push:
   pull_request:
@@ -17,7 +15,7 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install Deps
       run: |
@@ -50,13 +48,34 @@ jobs:
         export "IDF_PATH=${GITHUB_WORKSPACE}/lib/esp-idf"
         . ./lib/esp-idf/export.sh
 
-    - name: Build ESP32 port
-      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911 --ccache
+    - name: Build ESP32_GENERIC_S3
+      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
+
+    - name: Build ESP32_GENERIC_S3 SPIRAM_OCT
+      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
+
+    - name: Build ESP32_GENERIC_S3 SPIRAM_OCT
+      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=8 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
+
+    - name: Build ESP32_GENERIC_S3 SPIRAM_OCT
+      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=8 --octal-flash DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
+
+    - name: Build ESP32_GENERIC_S3 SPIRAM_OCT
+      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=16 --octal-flash DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
+
+    - name: Build ESP32_GENERIC_S2 SPIRAM_OCT
+      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S2 BOARD_VARIANT=SPIRAM_OCT DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
 
     - uses: actions/upload-artifact@v4
       with:
-        name: lvgl_micropy_ESP32_GENERIC_S3-8
-        path: build/lvgl_micropy_ESP32_GENERIC_S3-8.bin
+        name: lvgl_micropy_ESP32
+        path:
+          lvgl_micropy_ESP32_GENERIC_S3-4.bin
+          lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-4.bin
+          lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-8.bin
+          lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT_OCTFLASH-8.bin
+          lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT_OCTFLASH-16.bin
+          lvgl_micropy_ESP32_GENERIC_S2-4.bin
         if-no-files-found: ignore
 
   build_unix:
@@ -67,13 +86,13 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install Deps
       run: |
         sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev
         git submodule update --init -- lib/pycparser
-        git submodule update --init --jobs 4 -- lib/micropython        
+        git submodule update --init --jobs 4 -- lib/micropython
         git submodule update --init --jobs 4 -- lib/lvgl        
         git submodule update --init --jobs 4 -- lib/SDL
         cd lib/SDL
@@ -104,7 +123,7 @@ jobs:
   #
   #  - uses: actions/setup-python@v5
   #    with:
-  #      python-version: '3.10'
+  #      python-version: '3.11'
   #
   #  - name: Install Deps
   #    run: |

builder/__init__.py

@@ -11,7 +11,13 @@
 _windows_env = None
 
 
+DO_NOT_SCRUB_BUILD_FOLDER = False
+
+
 def scrub_build_folder():
+    if DO_NOT_SCRUB_BUILD_FOLDER:
+        return
+
     for f in os.listdir('build'):
         f = os.path.join('build', f)
         for pattern in ('.h', 'manifest.py', '.board'):
@@ -268,6 +274,40 @@ def generate_manifest(
         entry = f"freeze('{file_path}', '{file_name}')"
         manifest_files.append(entry)
 
+    if 'all' in io_expanders:
+        io_expanders.remove('all')
+        path = f'{script_dir}/api_drivers/common_api_drivers/io_expander'
+
+        for file in os.listdir(path):
+            if file.endswith('.py'):
+                name = file[:-3]
+                io_expanders.append(name)
+
+    if 'all' in indevs:
+        indevs.remove('all')
+        path = f'{script_dir}/api_drivers/common_api_drivers/ndev'
+        for file in os.listdir(path):
+            if (
+                file == 'focaltech_touch.py' or
+                file == 'evdev' or
+                'extension' in file or
+                'settings' in file
+            ):
+                continue
+
+            if file.endswith('.py'):
+                name = file[:-3]
+                indevs.append(name)
+
+    if 'all' in displays:
+        displays.remove('all')
+        path = f'{script_dir}/api_drivers/common_api_drivers/ndev'
+        for file in os.listdir(path):
+            if file.endswith('.py'):
+                continue
+
+            displays.append(file)
+
     for file in io_expanders:
         if not os.path.exists(file):
             tmp_file = (

make.py

@@ -29,7 +29,7 @@
 args1, extra_args = argParser.parse_known_args(sys.argv[1:])
 target = args1.target[0]
 
-argParser = ArgumentParser(prefix_chars='mscLBFDIVE')
+argParser = ArgumentParser(prefix_chars='-mscLBFDIVE')
 
 argParser.add_argument(
     'clean',
@@ -107,6 +107,14 @@
     default=[]
 )
 
+argParser.add_argument(
+    '--no-scrub',
+    dest='no_scrub',
+    default=False,
+    action='store_true'
+)
+
+
 args2, extra_args = argParser.parse_known_args(extra_args)
 
 lv_cflags = args2.lv_cflags
@@ -116,6 +124,7 @@
 displays = args2.displays
 indevs = args2.indevs
 expanders = args2.expanders
+builder.DO_NOT_SCRUB_BUILD_FOLDER = args2.no_scrub
 
 
 if lv_cflags is None: