updates the git workflow

lvgl-micropython · May 1, 2024 · 4ec9c76 · 4ec9c76
1 parent 7e43996
commit 4ec9c76
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 69 deletions.
diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -7,34 +7,23 @@ on:
 jobs:
   build:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    name: Build ${{ matrix.port }} port
     runs-on: macos-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        port: ['macOS', 'esp32', 'stm32', 'rp2']
+
     steps:
     - uses: actions/checkout@v4
     - uses: ammaraskar/gcc-problem-matcher@master
+
     - name: Install Dependencies
       run: brew install --force gcc libffi cmake ninja make
-    # STM32 & RPi Pico port
-    - name: arm-none-eabi-gcc
-      if: matrix.port == 'stm32' || matrix.port == 'rp2'
-      uses: carlosperate/[email protected]
-      with:
-        release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
+
+    - name: Build macOS port
+      run: python3 make.py macOS submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+
+    - name: Build ESP32 port
+      run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
+
     - name: Build STM32 port
-      if: matrix.port == 'stm32'
       run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32F7DISC DISPLAY=rgb_display INDEV=gt911
+
     - name: Build Raspberry Pi PICO port
-      if: matrix.port == 'rp2'
       run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=rgb_display INDEV=gt911
-    - name: Build ESP32 port
-      if: matrix.port == 'esp32'
-      run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
-    # macOS port
-    - name: Build macOS port
-      if: matrix.port == 'macOS'
-      run: python3 make.py macOS submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
-
diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml
@@ -7,38 +7,28 @@ on:
 jobs:
   build:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    name: Build ${{ matrix.port }} port
     runs-on: ubuntu-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        port: ['unix', 'esp32', 'stm32', 'rp2']
+
     steps:
     - uses: actions/checkout@v4
     - uses: ammaraskar/gcc-problem-matcher@master
-    - name: Install Dependencies
-      run: |
-        sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
-        sudo apt-get update -y -qq
-        sudo apt-get install --force-yes -y build-essential libffi-dev pkg-config cmake ninja-build 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
-
-    # STM32 & RPi Pico port
-    - name: arm-none-eabi-gcc
-      if: matrix.port == 'stm32' || matrix.port == 'rp2'
-      uses: carlosperate/[email protected]
-      with:
-        release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
+
+    - name: Install Deps
+      sudo apt-get install --force-yes -y 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
+
+    - name: Build Unix port
+      run: python3 make.py unix submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+
+    - name: Build ESP32 port
+      run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
+
     - name: Build STM32 port
-      if: matrix.port == 'stm32'
       run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32F7DISC DISPLAY=rgb_display INDEV=gt911
+
     - name: Build Raspberry Pi PICO port
-      if: matrix.port == 'rp2'
       run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=rgb_display INDEV=gt911
-    - name: Build ESP32 port
-      if: matrix.port == 'esp32'
-      run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
-    # Unix port
-    - name: Build Unix port
-      if: matrix.port == 'unix'
-      run: python3 make.py unix submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+
+
+
+
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -7,33 +7,26 @@ on:
 jobs:
   build:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    name: Build ${{ matrix.port }} port
     runs-on: windows-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        port: ['windows', 'esp32', 'stm32', 'rp2']
+
     steps:
     - uses: actions/checkout@v4
-    - uses: ammaraskar/gcc-problem-matcher@master
+
     - name: Install Dependencies
-      run: python3 -m pip install pyMSVC
-    # STM32 & RPi Pico port
-    - name: arm-none-eabi-gcc
-      if: matrix.port == 'stm32' || matrix.port == 'rp2'
-      uses: carlosperate/[email protected]
-      with:
-        release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
+      run: |
+        choco install make
+        python3 -m pip install pyMSVC
+
+    - name: Build Windows port
+      run: python3 make.py windows submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+
+    - name: Build ESP32 port
+      run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
+
     - name: Build STM32 port
-      if: matrix.port == 'stm32'
       run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32F7DISC DISPLAY=rgb_display INDEV=gt911
+
     - name: Build Raspberry Pi PICO port
-      if: matrix.port == 'rp2'
       run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=rgb_display INDEV=gt911
-    - name: Build ESP32 port
-      if: matrix.port == 'esp32'
-      run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
-    # windows port
-    - name: Build Windows port
-      if: matrix.port == 'windows'
-      run: python3 make.py windows submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+
+