From 57e4d18d264a4377f7330334919791779776f6f6 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:51:02 +0100
Subject: [PATCH] Refactor Berry solidified artifact upload

---
 .github/workflows/Tasmota_build_devel.yml | 68 +++++++----------------
 1 file changed, 21 insertions(+), 47 deletions(-)

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