Skip to content

Commit f537778

Browse files
kdschlosserkdschlosser
committed
updates ci
1 parent 8d15178 commit f537778

File tree

3 files changed

+114
-113
lines changed

3 files changed

+114
-113
lines changed

‎.github/workflows/macOS.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: macos-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v6
1616

17-
- uses: actions/setup-python@v5
17+
- uses: actions/setup-python@v6.1.0
1818
with:
1919
python-version: '3.11'
2020

‎.github/workflows/release.yml‎

Lines changed: 112 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -10,117 +10,160 @@ jobs:
1010
macos-rel:
1111
runs-on: macos-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v6
1414

15-
- uses: AButler/upload-release-assets@v3.0
15+
- uses: AButler/upload-release-assets@v5.0
1616
with:
1717
files: "build/*"
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919

20-
- uses: actions/setup-python@v5
20+
- uses: actions/setup-python@v6.1.0
2121
with:
22-
python-version: '3.10'
22+
python-version: '3.11'
2323

24-
- name: Install Dependencies
25-
run: brew install --force ninja
24+
- name: Install Deps
25+
run: |
26+
brew install --force ninja
27+
brew install --force sdl2
28+
brew install --force libffi
29+
git submodule update --init -- lib/pycparser
30+
git submodule update --init --jobs 4 -- lib/micropython
31+
git submodule update --init --jobs 4 -- lib/lvgl
2632
2733
- name: Build macOS port
2834
run: python3 make.py macOS DISPLAY=sdl_display INDEV=sdl_pointer
2935

3036
unix-rel:
3137
runs-on: ubuntu-latest
3238
steps:
33-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v6
3440

35-
- uses: AButler/upload-release-assets@v3.0
41+
- uses: AButler/upload-release-assets@v5.0
3642
with:
3743
files: "build/*"
3844
repo-token: ${{ secrets.GITHUB_TOKEN }}
3945

40-
- uses: actions/setup-python@v5
46+
- uses: actions/setup-python@v6.1.0
4147
with:
42-
python-version: '3.10'
48+
python-version: '3.11'
4349

4450
- name: Install Deps
45-
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 ccache
51+
# 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
52+
run: |
53+
git submodule update --init -- lib/pycparser
54+
git submodule update --init --jobs 4 -- lib/micropython
55+
git submodule update --init --jobs 4 -- lib/lvgl
56+
git submodule update --init --jobs 4 -- lib/SDL
57+
cd lib/SDL
58+
git checkout release-2.30.2
59+
cd ../..
4660
4761
- name: Build Unix port
4862
run: python3 make.py unix DISPLAY=sdl_display INDEV=sdl_pointer
4963

5064
esp32-rel:
5165
runs-on: ubuntu-latest
5266
steps:
53-
- uses: actions/checkout@v4
67+
- uses: actions/checkout@v6
5468

55-
- uses: AButler/upload-release-assets@v3.0
69+
- uses: AButler/upload-release-assets@v5.0
5670
with:
5771
files: "build/*"
5872
repo-token: ${{ secrets.GITHUB_TOKEN }}
5973

60-
- uses: actions/setup-python@v5
74+
- uses: actions/setup-python@v6.1.0
6175
with:
62-
python-version: '3.10'
63-
64-
- name: ESP32_GENERIC-SPIRAM-4
65-
run: python3 make.py esp32 BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM --flash-size=4 DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
66-
- name: ESP32_GENERIC-SPIRAM-8
67-
run: python3 make.py esp32 BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM --flash-size=8 DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
68-
- name: ESP32_GENERIC-SPIRAM-16
69-
run: python3 make.py esp32 BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM --flash-size=16 DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
70-
- name: ESP32_GENERIC_S2-SPIRAM-4
71-
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S2 BOARD_VARIANT=SPIRAM --flash-size=4 DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
72-
- name: ESP32_GENERIC_S3-SPIRAM-4
73-
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM --flash-size=4 DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
74-
- name: ESP32_GENERIC_S3-SPIRAM-8
75-
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM --flash-size=8 DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
76-
- name: ESP32_GENERIC_S3-SPIRAM_OCT-8
77-
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=8 DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
78-
- name: ESP32_GENERIC_S3-SPIRAM_OCT-16_OCTFLASH
79-
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=16 --octal-flash DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
80-
- name: ESP32_GENERIC_S3-SPIRAM_OCT-32_OCTFLASH
81-
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=32 --octal-flash DISPLAY=rgb_display DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
76+
python-version: '3.11'
8277

83-
rp2-rel:
84-
runs-on: ubuntu-latest
85-
steps:
86-
- uses: actions/checkout@v4
87-
88-
- uses: AButler/upload-release-assets@v3.0
89-
with:
90-
files: "build/*"
91-
repo-token: ${{ secrets.GITHUB_TOKEN }}
78+
- name: Install Deps
79+
# 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 ccache
80+
run: |
81+
git submodule update --init --depth 1 -- lib/pycparser
82+
git submodule update --init --depth 1 --jobs 4 -- lib/micropython
83+
git submodule update --init --depth 1 --jobs 4 -- lib/lvgl
84+
85+
- name: Get Build Deps
86+
run: |
87+
git submodule update --init --depth 1 --jobs 4 -- lib/esp-idf
88+
cd lib/esp-idf
89+
git submodule update --init --depth 1 --jobs 4 -- components/bt/host/nimble/nimble components/esp_wifi components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls components/bt/controller/lib_esp32 components/bt/controller/lib_esp32c3_family
90+
cd ../..
91+
export "IDF_PATH=${GITHUB_WORKSPACE}/lib/esp-idf"
92+
./lib/esp-idf/install.sh all
93+
94+
- name: Setup ESP-IDF
95+
run: |
96+
export "IDF_PATH=${GITHUB_WORKSPACE}/lib/esp-idf"
97+
. ./lib/esp-idf/export.sh
9298
93-
- uses: carlosperate/arm-none-eabi-gcc-action@v1.8.1
94-
with:
95-
release: '9-2019-q4'
99+
- name: ESP32_GENERIC-SPIRAM-4
100+
run: python3 make.py esp32 BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM --flash-size=4 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
96101

97-
- uses: actions/setup-python@v5
98-
with:
99-
python-version: '3.10'
102+
- name: ESP32_GENERIC-SPIRAM-8
103+
run: python3 make.py esp32 BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM --flash-size=8 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
100104

101-
# - name: Build Raspberry Pi PICO port
102-
# run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
105+
- name: ESP32_GENERIC_S2-SPIRAM-4
106+
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S2 BOARD_VARIANT=SPIRAM --flash-size=4 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
103107

104-
stm32-rel:
105-
runs-on: ubuntu-latest
106-
steps:
107-
- uses: actions/checkout@v4
108+
- name: ESP32_GENERIC_S3-4
109+
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 --flash-size=4 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
108110

109-
- uses: AButler/upload-release-assets@v3.0
110-
with:
111-
files: "build/*"
112-
repo-token: ${{ secrets.GITHUB_TOKEN }}
111+
- name: ESP32_GENERIC_S3-8
112+
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 --flash-size=8 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
113113

114-
- uses: carlosperate/arm-none-eabi-gcc-action@v1.8.1
115-
with:
116-
release: '9-2019-q4'
114+
- name: ESP32_GENERIC_S3-SPIRAM_OCT-8
115+
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
117116

118-
- uses: actions/setup-python@v5
119-
with:
120-
python-version: '3.10'
117+
- name: ESP32_GENERIC_S3-SPIRAM_OCT-16
118+
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=16 DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
121119

122-
# - name: STM32H7B3I_DK
123-
# run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32H7B3I_DK DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
120+
- name: ESP32_GENERIC_S3-SPIRAM_OCT-16_OCTFLASH
121+
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
124122

125-
# - name: STM32H573I_DK
126-
# run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32H573I_DK DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
123+
- name: ESP32_GENERIC_S3-SPIRAM_OCT-32_OCTFLASH
124+
run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT --flash-size=32 --octal-flash DISPLAY=all INDEV=all EXPANDER=all --ccache --no-scrub
125+
126+
# rp2-rel:
127+
# runs-on: ubuntu-latest
128+
# steps:
129+
# - uses: actions/checkout@v6
130+
#
131+
# - uses: AButler/upload-release-assets@v5.0
132+
# with:
133+
# files: "build/*"
134+
# repo-token: ${{ secrets.GITHUB_TOKEN }}
135+
#
136+
# - uses: carlosperate/arm-none-eabi-gcc-action@v1.11.1
137+
# with:
138+
# release: '9-2019-q4'
139+
#
140+
# - uses: actions/setup-python@v6.1.0
141+
# with:
142+
# python-version: '3.10'
143+
144+
# - name: Build Raspberry Pi PICO port
145+
# run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
146+
147+
# stm32-rel:
148+
# runs-on: ubuntu-latest
149+
# steps:
150+
# - uses: actions/checkout@v6
151+
#
152+
# - uses: AButler/upload-release-assets@v5.0
153+
# with:
154+
# files: "build/*"
155+
# repo-token: ${{ secrets.GITHUB_TOKEN }}
156+
#
157+
# - uses: carlosperate/arm-none-eabi-gcc-action@v1.11.1
158+
# with:
159+
# release: '9-2019-q4'
160+
#
161+
# - uses: actions/setup-python@v6.1.0
162+
# with:
163+
# python-version: '3.10'
164+
#
165+
# - name: STM32H7B3I_DK
166+
# run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32H7B3I_DK DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06
167+
#
168+
# - name: STM32H573I_DK
169+
# run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32H573I_DK DISPLAY=st7796 DISPLAY=st7789 DISPLAY=st7735 DISPLAY=ili9488 DISPLAY=ili9486 DISPLAY=ili9481 DISPLAY=ili9341 DISPLAY=ili9225 DISPLAY=ili9163 DISPLAY=gc9a01 INDEV=xpt2046 INDEV=gt911 INDEV=ft6x36 INDEV=ft6x06 INDEV=ft5x16 INDEV=ft5x06

‎.github/workflows/windows.yml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)