From e76a339d4e06a2487a92eb8c9de5a3a121e65db6 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 10 Sep 2025 20:03:12 +0200 Subject: [PATCH 1/5] Change PIO archive format to tar.xz --- tools/archive-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/archive-build.sh b/tools/archive-build.sh index 1b8090f36..dd00ed051 100755 --- a/tools/archive-build.sh +++ b/tools/archive-build.sh @@ -4,7 +4,7 @@ idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT" archive_path="dist/arduino-esp32-libs-$TARGET-$idf_version_string.tar.gz" build_archive_path="dist/arduino-esp32-build-$TARGET-$idf_version_string.tar.gz" -pio_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.tar.gz" +pio_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.tar.xz" pio_zip_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.zip" mkdir -p dist && rm -rf "$archive_path" "$build_archive_path" @@ -67,5 +67,5 @@ cd ../../../ if [[ -z "$GITHUB_ACTIONS" ]]; then echo "Creating PlatformIO Tasmota framework-arduinoespressif32" - 7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/ + tar -Jcf ../$pio_archive_path framework-arduinoespressif32/ --exclude='.*' fi From 181ce4683189ed57ea7b11dac17bf47c21be9c7d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 10 Sep 2025 20:11:27 +0200 Subject: [PATCH 2/5] Replace ZIP with TAR.XZ for framework archive --- .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 f185c2727..bc071f213 100644 --- a/.github/workflows/parallel_build.yaml +++ b/.github/workflows/parallel_build.yaml @@ -105,7 +105,7 @@ jobs: echo "Warning: coprocessor_fw_version.txt not found" fi - 7z a -mx=9 -tzip -xr'!.*' framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32/ + tar -Jcf framework-arduinoespressif32-${idf_version_string}.tar.xz framework-arduinoespressif32/ --exclude='.*' - name: Set tag name id: set_tag_name @@ -121,7 +121,7 @@ jobs: body_path: release-info.txt prerelease: true files: | - framework-arduinoespressif32-*.zip + framework-arduinoespressif32-*.tar.xz release-info.txt env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7460089cc7888d7dc58d7c055d137c664abae15c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 10 Sep 2025 20:32:06 +0200 Subject: [PATCH 3/5] Fix tar command syntax for archiving --- 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 dd00ed051..a4b362852 100755 --- a/tools/archive-build.sh +++ b/tools/archive-build.sh @@ -67,5 +67,5 @@ cd ../../../ if [[ -z "$GITHUB_ACTIONS" ]]; then echo "Creating PlatformIO Tasmota framework-arduinoespressif32" - tar -Jcf ../$pio_archive_path framework-arduinoespressif32/ --exclude='.*' + tar --exclude=.* -Jcf ../$pio_archive_path framework-arduinoespressif32/ fi From 05500e2ce522540d3a4981d287f5ebbca5182277 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 10 Sep 2025 20:34:02 +0200 Subject: [PATCH 4/5] Fix tar command syntax for archiving framework --- .github/workflows/parallel_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml index bc071f213..311a123fe 100644 --- a/.github/workflows/parallel_build.yaml +++ b/.github/workflows/parallel_build.yaml @@ -105,7 +105,7 @@ jobs: echo "Warning: coprocessor_fw_version.txt not found" fi - tar -Jcf framework-arduinoespressif32-${idf_version_string}.tar.xz framework-arduinoespressif32/ --exclude='.*' + tar --exclude=.* -Jcf framework-arduinoespressif32-${idf_version_string}.tar.xz framework-arduinoespressif32/ - name: Set tag name id: set_tag_name From 5cd02a40f3ef0e6503cc58c53018e08b5a6b1682 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 10 Sep 2025 20:37:06 +0200 Subject: [PATCH 5/5] Replace 7zip with xz in CI preparation script --- tools/prepare-ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/prepare-ci.sh b/tools/prepare-ci.sh index d36660ddb..2e8e1279b 100755 --- a/tools/prepare-ci.sh +++ b/tools/prepare-ci.sh @@ -7,13 +7,13 @@ if [[ "$OSTYPE" == "darwin"* ]]; then brew install gperf || true brew install ninja || true brew install ccache || true - brew install 7zip || true + brew install xz || true brew install uv || true 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 p7zip-full + sudo apt update && sudo apt install -y gperf cmake ninja-build ccache xz-utils curl -LsSf https://astral.sh/uv/install.sh | sh uv venv uv pip install future pyelftools