Refactor Berry solidified artifact upload

This commit is contained in:
Jason2866 2025-02-05 12:51:02 +01:00 committed by GitHub
parent d4a8952c34
commit 57e4d18d26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -26,56 +26,30 @@ jobs:
with: with:
python-version: '3.x' python-version: '3.x'
- name: Make Berry and Tasmota Berry code - name: Make Berry and Solidify code
run: | run: |
cd lib/libesp32/berry cd lib/libesp32/berry
make make
cd ../berry_tasmota cd ../berry_tasmota
../berry/berry -s -g solidify_all.be ../berry/berry -s -g solidify_all.be
- uses: actions/upload-artifact@v4 cd ../berry_matter
with:
name: berry_tasmota
path: ./lib/libesp32/berry_tasmota/src/solidify
- name: Matter Berry Code
run: |
cd lib/libesp32/berry_matter
../berry/berry -s -g solidify_all.be ../berry/berry -s -g solidify_all.be
- uses: actions/upload-artifact@v4 cd ../berry_animate
with:
name: berry_matter
path: ./lib/libesp32/berry_matter/src/solidify
- name: Berry Animate Code
run: |
cd lib/libesp32/berry_animate
../berry/berry -s -g solidify_all.be ../berry/berry -s -g solidify_all.be
- uses: actions/upload-artifact@v4 cd ../../libesp32_lvgl/lv_binding_berry
with: ../../libesp32/berry/berry -s -g solidify_all.be
name: berry_animate cd ../lv_haspmota
path: ./lib/libesp32/berry_animate/src/solidify
- name: LVGL Berry Code
run: |
cd lib/libesp32_lvgl/lv_binding_berry
../../libesp32/berry/berry -s -g solidify_all.be ../../libesp32/berry/berry -s -g solidify_all.be
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: berry_lvgl name: berry
path: ./lib/libesp32_lvgl/lv_binding_berry/src/solidify path: |
./lib/libesp32/berry_tasmota/src/solidify
- name: HASPmota Berry Code ./lib/libesp32/berry_matter/src/solidify
run: | ./lib/libesp32/berry_animate/src/solidify
cd lib/libesp32_lvgl/lv_haspmota ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
../../libesp32/berry/berry -s -g solidify_all.be ./lib/libesp32_lvgl/lv_haspmota/src/solidify
- uses: actions/upload-artifact@v4 ./lib/libesp32/berry/generate
with:
name: berry_haspmota
path: ./lib/libesp32_lvgl/lv_haspmota/src/solidify
- uses: actions/upload-artifact@v4
with:
name: berry_header
path: ./lib/libesp32/berry/generate
push_solidified: push_solidified:
needs: be_solidify needs: be_solidify
@ -90,17 +64,17 @@ jobs:
python-version: '3.x' python-version: '3.x'
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
pattern: berry* pattern: berry
path: berry path: berry
- name: Move solidified Berry files back - name: Move solidified Berry files back
run: | run: |
ls -R ./berry ls -R ./berry
mv berry/berry_tasmota/* ./lib/libesp32/berry_tasmota/src/solidify mv berry/berry/libesp32/berry_tasmota/src/solidify/* ./lib/libesp32/berry_tasmota/src/solidify
mv berry/berry_matter/* ./lib/libesp32/berry_matter/src/solidify mv berry/berry/libesp32/berry_matter/src/solidify/* ./lib/libesp32/berry_matter/src/solidify
mv berry/berry_animate/* ./lib/libesp32/berry_animate/src/solidify mv berry/berry/libesp32/berry_animate/src/solidify/* ./lib/libesp32/berry_animate/src/solidify
mv berry/berry_lvgl/* ./lib/libesp32_lvgl/lv_binding_berry/src/solidify mv berry/berry/libesp32_lvgl/lv_binding_berry/src/solidify/* ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
mv berry/berry_haspmota/* ./lib/libesp32_lvgl/lv_haspmota/src/solidify mv berry/berry/libesp32_lvgl/lv_haspmota/src/solidify/* ./lib/libesp32_lvgl/lv_haspmota/src/solidify
mv berry/berry_header/* ./lib/libesp32/berry/generate mv berry/berry/libesp32/berry/generate/* ./lib/libesp32/berry/generate
- uses: stefanzweifel/git-auto-commit-action@v5 - uses: stefanzweifel/git-auto-commit-action@v5
with: with:
commit_message: Solidified Code updated commit_message: Solidified Code updated