From 30a2591fd863525017cb6fd7f173ff50da585c09 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 12 Jul 2025 11:40:48 +0200
Subject: [PATCH 01/20] Update prepare-ci.sh

---
 tools/prepare-ci.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/prepare-ci.sh b/tools/prepare-ci.sh
index 5e996fcc..8e10c9fb 100755
--- a/tools/prepare-ci.sh
+++ b/tools/prepare-ci.sh
@@ -2,16 +2,16 @@
 
 # Ubuntu setup
 # Change in archive-build.sh gawk to awk
-#sudo apt update && sudo apt install -y gperf cmake ninja-build ccache
-#pip3 install wheel future pyelftools
+sudo apt update && sudo apt install -y gperf cmake ninja-build ccache
+pip3 install wheel future pyelftools
 
 # MacOS (ARM) setup
 # Change in archive-build.sh awk to gawk
-brew install gsed
-brew install gawk
-brew install gperf
-#brew install ninja
-brew install ccache
-python -m pip install uv
-uv venv
-uv pip install future pyelftools
+#brew install gsed
+#brew install gawk
+#brew install gperf
+##brew install ninja
+#brew install ccache
+#python -m pip install uv
+#uv venv
+#uv pip install future pyelftools

From 58e42139d8cdf97cc603591b1fc463bfd0cce199 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 12 Jul 2025 11:41:44 +0200
Subject: [PATCH 02/20] Update archive-build.sh

---
 tools/archive-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 1a999662..139d720b 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -61,7 +61,7 @@ mv arduino-esp32/ framework-arduinoespressif32/
 cd framework-arduinoespressif32/libraries
 rm -rf **/examples
 cd ../tools/esp32-arduino-libs
-# rm -rf **/flags
+rm -rf **/flags
 cd ../../../
 # If the framework is needed as tar.gz uncomment next line
 # tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/

From 68ba422f4beebde06a95946e242e97f3d4826f1b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 12 Jul 2025 11:43:59 +0200
Subject: [PATCH 03/20] Update parallel_build.yaml

---
 .github/workflows/parallel_build.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 52b880e3..3ca38c5c 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -6,7 +6,7 @@ on:
 jobs:
   build-libs:
     name: Build Libs for ${{ matrix.target }}
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
@@ -32,7 +32,7 @@ jobs:
 
   build-slave_firmware:
     name: Build Slave Firmware
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
@@ -53,7 +53,7 @@ jobs:
   combine-artifacts:
     name: Combine artifacts and create framework
     needs: [build-libs, build-slave_firmware]
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
@@ -96,7 +96,7 @@ jobs:
   release_framework:
     name: Release Framework
     needs: combine-artifacts
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Download complete framework

From c80d7b1f4aa0f30d046cbd991d8b50947c0295ea Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 12 Jul 2025 11:52:01 +0200
Subject: [PATCH 04/20] Update archive-build.sh

---
 tools/archive-build.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 139d720b..db0c9143 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -10,7 +10,7 @@ pio_zip_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_str
 mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
 
 cd out
-echo "Creating PlatformIO Tasmota framework-arduinoespressif32"
+echo "Copying built MCU libs to framework"
 mkdir -p arduino-esp32/cores/esp32
 mkdir -p arduino-esp32/tools/partitions
 cp -rf ../components/arduino/tools arduino-esp32
@@ -63,6 +63,4 @@ rm -rf **/examples
 cd ../tools/esp32-arduino-libs
 rm -rf **/flags
 cd ../../../
-# If the framework is needed as tar.gz uncomment next line
-# tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/
-7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/
+# 7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/

From d2985ff83f44084ea3829a6902522138d8211b9f Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 12 Jul 2025 12:16:39 +0200
Subject: [PATCH 05/20] Update archive-build.sh

---
 tools/archive-build.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index db0c9143..37a4da6a 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -63,4 +63,12 @@ rm -rf **/examples
 cd ../tools/esp32-arduino-libs
 rm -rf **/flags
 cd ../../../
+
+echo "Listing current directory:"
+ls -la
+echo "Listing dist directory:"
+ls -la dist/ || echo "dist directory not found"
+echo "Listing framework-arduinoespressif32 directory:"
+ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
+
 # 7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/

From 0c82dd365d6a677229039b96926c0e70c3ead511 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 12:27:32 +0200
Subject: [PATCH 06/20] wrong folder for build framework

---
 .github/workflows/parallel_build.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 3ca38c5c..054f2723 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -28,7 +28,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: artifacts-${{ matrix.target }}
-        path: framework-arduinoespressif32
+        path: out/framework-arduinoespressif32
 
   build-slave_firmware:
     name: Build Slave Firmware
@@ -63,7 +63,7 @@ jobs:
     - name: Download build artifacts
       uses: actions/download-artifact@v4
       with:
-        path: dist
+        path: out
         pattern: artifacts-*
         merge-multiple: true
     - name: Download slave firmware
@@ -77,11 +77,11 @@ jobs:
         ls -la
         echo "Listing slave_firmware directory:"
         ls -la slave_firmware/ || echo "slave_firmware directory not found"
-        echo "Listing dist directory:"
-        ls -la dist/ || echo "dist directory not found"
+        echo "Listing out directory:"
+        ls -la out/ || echo "out directory not found"
         # Integrate slave firmware directly
-        mkdir -p dist/framework-arduinoespressif32/tools/slave_firmware
-        cp -r slave_firmware/* dist/framework-arduinoespressif32/tools/slave_firmware/
+        mkdir -p out/framework-arduinoespressif32/tools/slave_firmware
+        cp -r slave_firmware/* out/framework-arduinoespressif32/tools/slave_firmware/
         # Create final framework ZIP
         (cd dist && zip -qr framework-arduinoespressif32.zip framework-arduinoespressif32)
 

From d528bca1fd6b74bdc44f6d0f419f3e51489cec92 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:01:02 +0200
Subject: [PATCH 07/20] fix path and release

---
 .github/workflows/parallel_build.yaml | 45 +++++++++------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 054f2723..3246bc3d 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -23,7 +23,9 @@ jobs:
       run: |
         echo "GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
     - name: Build Libs for ${{ matrix.target }}
-      run: bash ./build.sh -e -t ${{ matrix.target }}
+      run: |
+        bash ./build.sh -e -t ${{ matrix.target }}
+        mv release-info.txt out/framework-arduinoespressif32
     - name: Upload artifacts for ${{ matrix.target }}
       uses: actions/upload-artifact@v4
       with:
@@ -63,7 +65,7 @@ jobs:
     - name: Download build artifacts
       uses: actions/download-artifact@v4
       with:
-        path: out
+        path: framework-arduinoespressif32
         pattern: artifacts-*
         merge-multiple: true
     - name: Download slave firmware
@@ -77,41 +79,24 @@ jobs:
         ls -la
         echo "Listing slave_firmware directory:"
         ls -la slave_firmware/ || echo "slave_firmware directory not found"
-        echo "Listing out directory:"
-        ls -la out/ || echo "out directory not found"
+        echo "Listing framework-arduinoespressif32 directory:"
+        ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
         # Integrate slave firmware directly
-        mkdir -p out/framework-arduinoespressif32/tools/slave_firmware
-        cp -r slave_firmware/* out/framework-arduinoespressif32/tools/slave_firmware/
+        mkdir -p framework-arduinoespressif32/tools/slave_firmware
+        cp -r slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
         # Create final framework ZIP
-        (cd dist && zip -qr framework-arduinoespressif32.zip framework-arduinoespressif32)
+        cd framework-arduinoespressif32
+        mv release-info.txt ..
+        zip -qr framework-arduinoespressif32.zip framework-arduinoespressif32
 
-    - name: Upload framework artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: framework
-        path: |
-          dist/framework*
-          dist/release-info.txt
-
-  release_framework:
-    name: Release Framework
-    needs: combine-artifacts
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Download complete framework
-      uses: actions/download-artifact@v4
-      with:
-        name: framework
-        path: dist
-    - name: Release
+    - name: Release fraamework-arduinoespressif32
       uses: jason2866/action-gh-release@v1.3
       with:
         tag_name: ${{ github.run_number }}
-        body_path: dist/release-info.txt
+        body_path: release-info.txt
         prerelease: true
         files: |
-          dist/framework*
-          dist/release-info.txt
+          framework-arduinoespressif32/framework*.zip
+          release-info.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 1fbc39d0487bf845cd3c59126443ab3aeb1fad4b Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:10:44 +0200
Subject: [PATCH 08/20] detect OS (MacOS / Linux)

---
 tools/prepare-ci.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/prepare-ci.sh b/tools/prepare-ci.sh
index 8e10c9fb..90b347cb 100755
--- a/tools/prepare-ci.sh
+++ b/tools/prepare-ci.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-# Ubuntu setup
-# Change in archive-build.sh gawk to awk
-sudo apt update && sudo apt install -y gperf cmake ninja-build ccache
-pip3 install wheel future pyelftools
-
-# MacOS (ARM) setup
-# Change in archive-build.sh awk to gawk
-#brew install gsed
-#brew install gawk
-#brew install gperf
-##brew install ninja
-#brew install ccache
-#python -m pip install uv
-#uv venv
-#uv pip install future pyelftools
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    echo "macOS OS detected. Install dependencies..."
+    brew install gsed || true
+    brew install gawk || true
+    brew install gperf || true
+    brew install ninja || true
+    brew install ccache || true
+    python3 -m pip install uv
+    uv venv
+    uv pip install future pyelftools
+else
+    echo "Linux detected. Install dependencies..."
+    sudo apt update && sudo apt install -y gperf cmake ninja-build ccache
+    pip3 install wheel future pyelftools
+fi

From 8b8b2df450abf52e6c566fa3d2a784ba442f0d93 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:20:32 +0200
Subject: [PATCH 09/20] step out of folder to zip

---
 .github/workflows/parallel_build.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 3246bc3d..539d0cf8 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -87,6 +87,7 @@ jobs:
         # Create final framework ZIP
         cd framework-arduinoespressif32
         mv release-info.txt ..
+        cd ..
         zip -qr framework-arduinoespressif32.zip framework-arduinoespressif32
 
     - name: Release fraamework-arduinoespressif32
@@ -96,7 +97,7 @@ jobs:
         body_path: release-info.txt
         prerelease: true
         files: |
-          framework-arduinoespressif32/framework*.zip
+          framework-arduinoespressif32.zip
           release-info.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 9faeef0daa793321ccaaa9d640be9a20371076ee Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:26:26 +0200
Subject: [PATCH 10/20] mv not cp

---
 .github/workflows/parallel_build.yaml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 539d0cf8..b5119b7c 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -77,17 +77,13 @@ jobs:
       run: |
         echo "Listing current directory:"
         ls -la
-        echo "Listing slave_firmware directory:"
-        ls -la slave_firmware/ || echo "slave_firmware directory not found"
         echo "Listing framework-arduinoespressif32 directory:"
         ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
-        # Integrate slave firmware directly
+        # Integrate slave firmware in framework
         mkdir -p framework-arduinoespressif32/tools/slave_firmware
-        cp -r slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
+        mv -v slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
+        mv framework-arduinoespressif32/release-info.txt .
         # Create final framework ZIP
-        cd framework-arduinoespressif32
-        mv release-info.txt ..
-        cd ..
         zip -qr framework-arduinoespressif32.zip framework-arduinoespressif32
 
     - name: Release fraamework-arduinoespressif32

From 83c6a4266f8efd4725e9a59f7fc39dc62c89d95b Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:29:03 +0200
Subject: [PATCH 11/20] small changes

---
 .github/workflows/parallel_build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index b5119b7c..c05b103c 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -81,12 +81,12 @@ jobs:
         ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
         # Integrate slave firmware in framework
         mkdir -p framework-arduinoespressif32/tools/slave_firmware
-        mv -v slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
+        mv slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
         mv framework-arduinoespressif32/release-info.txt .
         # Create final framework ZIP
         zip -qr framework-arduinoespressif32.zip framework-arduinoespressif32
 
-    - name: Release fraamework-arduinoespressif32
+    - name: Release framework-arduinoespressif32
       uses: jason2866/action-gh-release@v1.3
       with:
         tag_name: ${{ github.run_number }}

From 7e2404658ae584a80ea0a889a9af0051bee4e089 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:41:15 +0200
Subject: [PATCH 12/20] Use idf_version_string in zip

---
 .github/workflows/parallel_build.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index c05b103c..f3aee185 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -83,8 +83,11 @@ jobs:
         mkdir -p framework-arduinoespressif32/tools/slave_firmware
         mv slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
         mv framework-arduinoespressif32/release-info.txt .
+        IDF_BRANCH=$(grep '^IDF_BRANCH=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
+        IDF_COMMIT=$(grep '^IDF_COMMIT=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
+        idf_version_string="${IDF_BRANCH//\//_}-$IDF_COMMIT"
         # Create final framework ZIP
-        zip -qr framework-arduinoespressif32.zip framework-arduinoespressif32
+        zip -qr framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32
 
     - name: Release framework-arduinoespressif32
       uses: jason2866/action-gh-release@v1.3
@@ -93,7 +96,7 @@ jobs:
         body_path: release-info.txt
         prerelease: true
         files: |
-          framework-arduinoespressif32.zip
+          framework-arduinoespressif32-*.zip
           release-info.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 70b2d5b87b02c4220627852164fb91d2504248fc Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:53:49 +0200
Subject: [PATCH 13/20] clean up and use 7z

---
 .github/workflows/parallel_build.yaml | 11 ++---------
 tools/archive-build.sh                |  7 -------
 tools/prepare-ci.sh                   |  3 ++-
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index f3aee185..8c3f0332 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -44,8 +44,7 @@ jobs:
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
     - name: Build slave firmware
-      run: |
-        bash ./tools/compile_slave.sh
+      run: bash ./tools/compile_slave.sh
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -75,19 +74,13 @@ jobs:
         path: slave_firmware
     - name: Create complete framework
       run: |
-        echo "Listing current directory:"
-        ls -la
-        echo "Listing framework-arduinoespressif32 directory:"
-        ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
-        # Integrate slave firmware in framework
         mkdir -p framework-arduinoespressif32/tools/slave_firmware
         mv slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
         mv framework-arduinoespressif32/release-info.txt .
         IDF_BRANCH=$(grep '^IDF_BRANCH=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
         IDF_COMMIT=$(grep '^IDF_COMMIT=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
         idf_version_string="${IDF_BRANCH//\//_}-$IDF_COMMIT"
-        # Create final framework ZIP
-        zip -qr framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32
+        7z a -mx=9 -tzip -xr'!.*' framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32/
 
     - name: Release framework-arduinoespressif32
       uses: jason2866/action-gh-release@v1.3
diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 37a4da6a..202a22fd 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -64,11 +64,4 @@ cd ../tools/esp32-arduino-libs
 rm -rf **/flags
 cd ../../../
 
-echo "Listing current directory:"
-ls -la
-echo "Listing dist directory:"
-ls -la dist/ || echo "dist directory not found"
-echo "Listing framework-arduinoespressif32 directory:"
-ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
-
 # 7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/
diff --git a/tools/prepare-ci.sh b/tools/prepare-ci.sh
index 90b347cb..c9bed7bf 100755
--- a/tools/prepare-ci.sh
+++ b/tools/prepare-ci.sh
@@ -7,11 +7,12 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     brew install gperf || true
     brew install ninja || true
     brew install ccache || true
+    brew install 7zip || true
     python3 -m pip install uv
     uv venv
     uv pip install future pyelftools
 else
     echo "Linux detected. Install dependencies..."
-    sudo apt update && sudo apt install -y gperf cmake ninja-build ccache
+    sudo apt update && sudo apt install -y gperf cmake ninja-build ccache p7zip-full
     pip3 install wheel future pyelftools
 fi

From ca84ea8bfac9b80c2da58da1611b0c13f5a90226 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 13:56:13 +0200
Subject: [PATCH 14/20] make script working when not used with GH Actions

---
 tools/archive-build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 202a22fd..9ff5c5f7 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -64,4 +64,7 @@ cd ../tools/esp32-arduino-libs
 rm -rf **/flags
 cd ../../../
 
-# 7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/
+
+if [[ -z "$GITHUB_ACTIONS" ]]; then
+    7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/
+fi

From c1f9c303a9c0a9e5422312923e06f58b1c61c96b Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 14:10:59 +0200
Subject: [PATCH 15/20] fix branch for grep for release-info.txt

---
 .github/workflows/parallel_build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 8c3f0332..2caa1d62 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -77,8 +77,8 @@ jobs:
         mkdir -p framework-arduinoespressif32/tools/slave_firmware
         mv slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
         mv framework-arduinoespressif32/release-info.txt .
-        IDF_BRANCH=$(grep '^IDF_BRANCH=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
-        IDF_COMMIT=$(grep '^IDF_COMMIT=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
+        IDF_BRANCH=$(grep '^IDF_BRANCH=' release-info.txt | cut -d'=' -f2 | tr -d '"')
+        IDF_COMMIT=$(grep '^IDF_COMMIT=' release-info.txt | cut -d'=' -f2 | tr -d '"')
         idf_version_string="${IDF_BRANCH//\//_}-$IDF_COMMIT"
         7z a -mx=9 -tzip -xr'!.*' framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32/
 

From f9a017b332d1971686cce26b2afaa4cddd4e566f Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 14:19:13 +0200
Subject: [PATCH 16/20] more informative release tag

---
 .github/workflows/parallel_build.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 2caa1d62..ec5139ab 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -85,7 +85,7 @@ jobs:
     - name: Release framework-arduinoespressif32
       uses: jason2866/action-gh-release@v1.3
       with:
-        tag_name: ${{ github.run_number }}
+        tag_name: ${{ steps.set_tag_name.outputs.tag_name }}
         body_path: release-info.txt
         prerelease: true
         files: |
@@ -93,3 +93,9 @@ jobs:
           release-info.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Set tag name
+      id: set_tag_name
+      run: |
+        IDF_VERSION=$(grep '^IDF_VERSION=' release-info.txt | cut -d'=' -f2 | cut -d'.' -f1,2 | tr -d '"')
+        DATE=$(date +"%d.%m")
+        echo "tag_name=IDF${IDF_VERSION}-${DATE}" >> $GITHUB_OUTPUT

From b1162fb430671d3f121e3e2cb60d25b4e07ee4b3 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 14:26:08 +0200
Subject: [PATCH 17/20] log info for zip framework

---
 tools/archive-build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 9ff5c5f7..1b8090f3 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -66,5 +66,6 @@ cd ../../../
 
 
 if [[ -z "$GITHUB_ACTIONS" ]]; then
+    echo "Creating PlatformIO Tasmota framework-arduinoespressif32"
     7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/
 fi

From 5accf4ad5c3707598db3c38a6c7e30e1c050dbb2 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 14:51:10 +0200
Subject: [PATCH 18/20] fix grep

---
 .github/workflows/parallel_build.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index ec5139ab..1f3266d1 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -77,8 +77,10 @@ jobs:
         mkdir -p framework-arduinoespressif32/tools/slave_firmware
         mv slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
         mv framework-arduinoespressif32/release-info.txt .
-        IDF_BRANCH=$(grep '^IDF_BRANCH=' release-info.txt | cut -d'=' -f2 | tr -d '"')
-        IDF_COMMIT=$(grep '^IDF_COMMIT=' release-info.txt | cut -d'=' -f2 | tr -d '"')
+        IDF_BRANCH=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*branch \[([^]]+)\].*/\1/')
+        IDF_COMMIT=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*commit \[([^]]+)\].*/\1/')
+        echo "IDF_BRANCH=$IDF_BRANCH"
+        echo "IDF_COMMIT=$IDF_COMMIT"
         idf_version_string="${IDF_BRANCH//\//_}-$IDF_COMMIT"
         7z a -mx=9 -tzip -xr'!.*' framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32/
 
@@ -96,6 +98,6 @@ jobs:
     - name: Set tag name
       id: set_tag_name
       run: |
-        IDF_VERSION=$(grep '^IDF_VERSION=' release-info.txt | cut -d'=' -f2 | cut -d'.' -f1,2 | tr -d '"')
+        IDF_VERSION=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*branch \[release\/v([0-9]+\.[0-9]+)\].*/\1/')
         DATE=$(date +"%d.%m")
         echo "tag_name=IDF${IDF_VERSION}-${DATE}" >> $GITHUB_OUTPUT

From 2dfb3c44b7820b2f4fa5e3190d7810e191741cb8 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 14:58:45 +0200
Subject: [PATCH 19/20] change tag

---
 .github/workflows/parallel_build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 1f3266d1..10feda0b 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -99,5 +99,5 @@ jobs:
       id: set_tag_name
       run: |
         IDF_VERSION=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*branch \[release\/v([0-9]+\.[0-9]+)\].*/\1/')
-        DATE=$(date +"%d.%m")
-        echo "tag_name=IDF${IDF_VERSION}-${DATE}" >> $GITHUB_OUTPUT
+        DATE=$(date +"%d%m-%H%M")
+        echo "tag_name=${DATE}-${IDF_VERSION}" >> $GITHUB_OUTPUT

From 910c0c37b2ca1c2d6b03c2a54fa3c2f682efa438 Mon Sep 17 00:00:00 2001
From: Jason2866 <obermeier.johann@googlemail.com>
Date: Sat, 12 Jul 2025 16:24:24 +0200
Subject: [PATCH 20/20] tsg generate before used

---
 .github/workflows/parallel_build.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index 10feda0b..4771c27a 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -84,6 +84,13 @@ jobs:
         idf_version_string="${IDF_BRANCH//\//_}-$IDF_COMMIT"
         7z a -mx=9 -tzip -xr'!.*' framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32/
 
+    - name: Set tag name
+      id: set_tag_name
+      run: |
+        IDF_VERSION=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*branch \[release\/v([0-9]+\.[0-9]+)\].*/\1/')
+        DATE=$(date +"%d%m-%H%M")
+        echo "tag_name=${DATE}-${IDF_VERSION}" >> $GITHUB_OUTPUT
+
     - name: Release framework-arduinoespressif32
       uses: jason2866/action-gh-release@v1.3
       with:
@@ -95,9 +102,3 @@ jobs:
           release-info.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Set tag name
-      id: set_tag_name
-      run: |
-        IDF_VERSION=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*branch \[release\/v([0-9]+\.[0-9]+)\].*/\1/')
-        DATE=$(date +"%d%m-%H%M")
-        echo "tag_name=${DATE}-${IDF_VERSION}" >> $GITHUB_OUTPUT