Skip to content

Commit b55ff46

Browse files
ThomasFarstrikeThomasFarstrike
committed
Update and simplify github workflows
1 parent ffad2b6 commit b55ff46

File tree

2 files changed

+23
-120
lines changed

2 files changed

+23
-120
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 15 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -67,90 +67,46 @@ jobs:
6767
echo "OS_VERSION=$OS_VERSION" >> $GITHUB_OUTPUT
6868
echo "Extracted version: $OS_VERSION"
6969
70-
- name: Build LVGL MicroPython for unix dev
70+
- name: Build LVGL MicroPython for unix
7171
run: |
72-
./scripts/build_mpos.sh unix dev
72+
./scripts/build_mpos.sh unix
7373
74-
- name: Run syntax tests on unix dev
74+
- name: Run syntax tests on unix
7575
run: |
7676
./tests/syntax.sh
7777
continue-on-error: true
7878

79-
- name: Run unit tests on unix dev
79+
- name: Run unit tests on unix
8080
run: |
8181
./tests/unittest.sh
82-
mv lvgl_micropython/build/lvgl_micropy_unix lvgl_micropython/build/MicroPythonOS_amd64_linux_dev_${{ steps.version.outputs.OS_VERSION }}.elf
82+
mv lvgl_micropython/build/lvgl_micropy_unix lvgl_micropython/build/MicroPythonOS_amd64_linux_${{ steps.version.outputs.OS_VERSION }}.elf
8383
continue-on-error: true
8484

8585
- name: Upload built binary as artifact
8686
uses: actions/upload-artifact@v4
8787
with:
88-
name: MicroPythonOS_amd64_linux_dev_${{ steps.version.outputs.OS_VERSION }}.elf
89-
path: lvgl_micropython/build/MicroPythonOS_amd64_linux_dev_${{ steps.version.outputs.OS_VERSION }}.elf
88+
name: MicroPythonOS_amd64_linux_${{ steps.version.outputs.OS_VERSION }}.elf
89+
path: lvgl_micropython/build/MicroPythonOS_amd64_linux_${{ steps.version.outputs.OS_VERSION }}.elf
9090
retention-days: 7
9191

92-
- name: Build LVGL MicroPython esp32 prod fri3d-2024
92+
- name: Build LVGL MicroPython esp32
9393
run: |
94-
./scripts/build_mpos.sh esp32 prod fri3d-2024
95-
mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin lvgl_micropython/build/MicroPythonOS_fri3d-2024_prod_${{ steps.version.outputs.OS_VERSION }}.bin
96-
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_fri3d-2024_prod_${{ steps.version.outputs.OS_VERSION }}.ota
94+
./scripts/build_mpos.sh esp32
95+
mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin lvgl_micropython/build/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin
96+
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
9797
9898
- name: Upload built binary as artifact
9999
uses: actions/upload-artifact@v4
100100
with:
101-
name: MicroPythonOS_fri3d-2024_prod_${{ steps.version.outputs.OS_VERSION }}.bin
102-
path: lvgl_micropython/build/MicroPythonOS_fri3d-2024_prod_${{ steps.version.outputs.OS_VERSION }}.bin
101+
name: MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin
102+
path: lvgl_micropython/build/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.bin
103103
retention-days: 7
104104

105105
- name: Upload built binary as artifact
106106
uses: actions/upload-artifact@v4
107107
with:
108-
name: MicroPythonOS_fri3d-2024_prod_${{ steps.version.outputs.OS_VERSION }}.ota
109-
path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_fri3d-2024_prod_${{ steps.version.outputs.OS_VERSION }}.ota
110-
retention-days: 7
111-
112-
- name: Build LVGL MicroPython esp32 dev fri3d-2024
113-
run: |
114-
./scripts/build_mpos.sh esp32 dev fri3d-2024
115-
mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin lvgl_micropython/build/MicroPythonOS_fri3d-2024_dev_${{ steps.version.outputs.OS_VERSION }}.bin
116-
117-
- name: Upload built binary as artifact
118-
uses: actions/upload-artifact@v4
119-
with:
120-
name: MicroPythonOS_fri3d-2024_dev_${{ steps.version.outputs.OS_VERSION }}.bin
121-
path: lvgl_micropython/build/MicroPythonOS_fri3d-2024_dev_${{ steps.version.outputs.OS_VERSION }}.bin
122-
retention-days: 7
123-
124-
- name: Build LVGL MicroPython esp32 prod waveshare-esp32-s3-touch-lcd-2
125-
run: |
126-
./scripts/build_mpos.sh esp32 prod waveshare-esp32-s3-touch-lcd-2
127-
mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin lvgl_micropython/build/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_${{ steps.version.outputs.OS_VERSION }}.bin
128-
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_waveshare-esp32-s3-touch-lcd-2_prod_${{ steps.version.outputs.OS_VERSION }}.ota
129-
130-
- name: Upload built binary as artifact
131-
uses: actions/upload-artifact@v4
132-
with:
133-
name: MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_${{ steps.version.outputs.OS_VERSION }}.bin
134-
path: lvgl_micropython/build/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_${{ steps.version.outputs.OS_VERSION }}.bin
135-
retention-days: 7
136-
137-
- name: Upload built binary as artifact
138-
uses: actions/upload-artifact@v4
139-
with:
140-
name: MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_${{ steps.version.outputs.OS_VERSION }}.ota
141-
path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_${{ steps.version.outputs.OS_VERSION }}.ota
142-
retention-days: 7
143-
144-
- name: Build LVGL MicroPython esp32 dev waveshare-esp32-s3-touch-lcd-2
145-
run: |
146-
./scripts/build_mpos.sh esp32 dev waveshare-esp32-s3-touch-lcd-2
147-
mv lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin lvgl_micropython/build/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev_${{ steps.version.outputs.OS_VERSION }}.bin
148-
149-
- name: Upload built binary as artifact
150-
uses: actions/upload-artifact@v4
151-
with:
152-
name: MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev_${{ steps.version.outputs.OS_VERSION }}.bin
153-
path: lvgl_micropython/build/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev_${{ steps.version.outputs.OS_VERSION }}.bin
108+
name: MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota
109+
path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/MicroPythonOS_esp32_${{ steps.version.outputs.OS_VERSION }}.ota
154110
retention-days: 7
155111

156112

‎.github/workflows/macos.yml‎

Lines changed: 8 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -31,42 +31,42 @@ jobs:
3131
3232
- name: Build LVGL MicroPython for macOS dev
3333
run: |
34-
./scripts/build_mpos.sh macOS dev
34+
./scripts/build_mpos.sh macOS
3535
36-
- name: Run syntax tests on macOS dev
36+
- name: Run syntax tests on macOS
3737
run: |
3838
./tests/syntax.sh
3939
continue-on-error: true
4040

41-
- name: Run unit tests on macOS dev
41+
- name: Run unit tests on macOS
4242
run: |
4343
./tests/unittest.sh
4444
continue-on-error: true
4545

4646
- name: Upload built binary as artifact
4747
uses: actions/upload-artifact@v4
4848
with:
49-
name: lvgl_micropy_macOS
49+
name: lvgl_micropy_macOS.bin
5050
path: lvgl_micropython/build/lvgl_micropy_macOS
5151
compression-level: 0 # don't zip it
5252
retention-days: 7
5353

54-
- name: Build LVGL MicroPython esp32 prod fri3d-2024
54+
- name: Build LVGL MicroPython esp32
5555
run: |
56-
./scripts/build_mpos.sh esp32 prod fri3d-2024
56+
./scripts/build_mpos.sh esp32
5757
5858
- name: Upload built binary as artifact
5959
uses: actions/upload-artifact@v4
6060
with:
61-
name: MicroPythonOS_fri3d-2024_prod
61+
name: MicroPythonOS_esp32.bin
6262
path: lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
6363
compression-level: 0 # don't zip it
6464
retention-days: 7
6565

6666
- name: Upload built binary as artifact
6767
uses: actions/upload-artifact@v4
6868
with:
69-
name: MicroPythonOS_fri3d-2024_prod.ota
69+
name: MicroPythonOS_esp32.ota
7070
path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin
7171
compression-level: 0 # don't zip it
7272
retention-days: 7
@@ -76,57 +76,4 @@ jobs:
7676
rm lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
7777
rm lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin
7878
79-
- name: Build LVGL MicroPython esp32 dev fri3d-2024
80-
run: |
81-
./scripts/build_mpos.sh esp32 dev fri3d-2024
82-
83-
- name: Upload built binary as artifact
84-
uses: actions/upload-artifact@v4
85-
with:
86-
name: MicroPythonOS_fri3d-2024_dev
87-
path: lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
88-
compression-level: 0 # don't zip it
89-
retention-days: 7
90-
91-
- name: Cleanup
92-
run: |
93-
rm lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
94-
rm lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin
95-
9679
97-
- name: Build LVGL MicroPython esp32 prod waveshare-esp32-s3-touch-lcd-2
98-
run: |
99-
./scripts/build_mpos.sh esp32 prod waveshare-esp32-s3-touch-lcd-2
100-
101-
- name: Upload built binary as artifact
102-
uses: actions/upload-artifact@v4
103-
with:
104-
name: MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod
105-
path: lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
106-
compression-level: 0 # don't zip it
107-
retention-days: 7
108-
109-
- name: Upload built binary as artifact
110-
uses: actions/upload-artifact@v4
111-
with:
112-
name: MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod.ota
113-
path: lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin
114-
compression-level: 0 # don't zip it
115-
retention-days: 7
116-
117-
- name: Cleanup
118-
run: |
119-
rm lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
120-
rm lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin
121-
122-
- name: Build LVGL MicroPython esp32 dev waveshare-esp32-s3-touch-lcd-2
123-
run: |
124-
./scripts/build_mpos.sh esp32 dev waveshare-esp32-s3-touch-lcd-2
125-
126-
- name: Upload built binary as artifact
127-
uses: actions/upload-artifact@v4
128-
with:
129-
name: MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev
130-
path: lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
131-
compression-level: 0 # don't zip it
132-
retention-days: 7

0 commit comments

Comments
 (0)