From 11bf16d162cf5cbd2def0b010c67dfeb2ed123b9 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 10 May 2023 23:57:54 +0200
Subject: [PATCH] Github Actions refactor artifact Up-/Download (#18640)

* multi artifact Up-/Download
---
 .github/workflows/Tasmota_build_devel.yml  | 39 +++++++-------------
 .github/workflows/Tasmota_build_master.yml | 41 +++++++---------------
 2 files changed, 25 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index a496e831c..5b69980e8 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -38,18 +38,10 @@ jobs:
         run: |
           cd lib/libesp32_lvgl/lv_binding_berry
           ../../libesp32/berry/berry -s -g solidify_all.be
-      - uses: actions/upload-artifact@v3
+      - uses: jason2866/upload-artifact@v2.0.2
         with:
-          name: berry_matter
-          path: ./lib/libesp32/berry_matter/src/solidify
-      - uses: actions/upload-artifact@v3
-        with:
-          name: berry_tasmota
-          path: ./lib/libesp32/berry_tasmota/src/solidify
-      - uses: actions/upload-artifact@v3
-        with:
-          name: lvgl_tasmota
-          path: ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+          name: '["berry_matter", "berry_tasmota", "lvgl_tasmota"]'
+          path: '["./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify"]'
 
   push_solidified:
     needs: be_solidify
@@ -61,23 +53,16 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: '3.x'
-      - name: Remove old solidified code
-        run: |
-          rm ./lib/libesp32/berry_matter/src/solidify/*
-          rm ./lib/libesp32/berry_tasmota/src/solidify/*
-          rm ./lib/libesp32_lvgl/lv_binding_berry/src/solidify/*
-      - uses: actions/download-artifact@v3
+      - uses: jason2866/download-artifact@v3
         with:
-          name: berry_matter
-          path: ./lib/libesp32/berry_matter/src/solidify
-      - uses: actions/download-artifact@v3
-        with:
-          name: berry_tasmota
-          path: ./lib/libesp32/berry_tasmota/src/solidify
-      - uses: actions/download-artifact@v3
-        with:
-          name: lvgl_tasmota
-          path: ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+          name: |
+            berry_matter
+            berry_tasmota
+            lvgl_tasmota 
+          path: |
+           ./lib/libesp32/berry_matter/src/solidify
+           ./lib/libesp32/berry_tasmota/src/solidify
+           ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Solidified Code updated
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 44868f8b1..e7c8587aa 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   be_solidify:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: github.repository == 'arendst/Tasmota'
     steps:
       - uses: actions/checkout@v3
@@ -37,18 +37,10 @@ jobs:
         run: |
           cd lib/libesp32_lvgl/lv_binding_berry
           ../../libesp32/berry/berry -s -g solidify_all.be
-      - uses: actions/upload-artifact@v3
+      - uses: jason2866/upload-artifact@v2.0.2
         with:
-          name: berry_matter
-          path: ./lib/libesp32/berry_matter/src/solidify
-      - uses: actions/upload-artifact@v3
-        with:
-          name: berry_tasmota
-          path: ./lib/libesp32/berry_tasmota/src/solidify
-      - uses: actions/upload-artifact@v3
-        with:
-          name: lvgl_tasmota
-          path: ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+          name: '["berry_matter", "berry_tasmota", "lvgl_tasmota"]'
+          path: '["./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify"]'
 
   push_solidified:
     needs: be_solidify
@@ -60,23 +52,16 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: '3.x'
-      - name: Remove old solidified code
-        run: |
-          rm ./lib/libesp32/berry_matter/src/solidify/*
-          rm ./lib/libesp32/berry_tasmota/src/solidify/*
-          rm ./lib/libesp32_lvgl/lv_binding_berry/src/solidify/*
-      - uses: actions/download-artifact@v3
+      - uses: jason2866/download-artifact@v3
         with:
-          name: berry_matter
-          path: ./lib/libesp32/berry_matter/src/solidify
-      - uses: actions/download-artifact@v3
-        with:
-          name: berry_tasmota
-          path: ./lib/libesp32/berry_tasmota/src/solidify
-      - uses: actions/download-artifact@v3
-        with:
-          name: lvgl_tasmota
-          path: ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+          name: |
+            berry_matter
+            berry_tasmota
+            lvgl_tasmota 
+          path: |
+           ./lib/libesp32/berry_matter/src/solidify
+           ./lib/libesp32/berry_tasmota/src/solidify
+           ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Solidified Code updated