Skip to content

Commit 70b2d5b

Browse files
committed
clean up and use 7z
1 parent 7e24046 commit 70b2d5b

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

.github/workflows/parallel_build.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ jobs:
4444
- name: Install dependencies
4545
run: bash ./tools/prepare-ci.sh
4646
- name: Build slave firmware
47-
run: |
48-
bash ./tools/compile_slave.sh
47+
run: bash ./tools/compile_slave.sh
4948
- name: Upload artifacts
5049
uses: actions/upload-artifact@v4
5150
with:
@@ -75,19 +74,13 @@ jobs:
7574
path: slave_firmware
7675
- name: Create complete framework
7776
run: |
78-
echo "Listing current directory:"
79-
ls -la
80-
echo "Listing framework-arduinoespressif32 directory:"
81-
ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
82-
# Integrate slave firmware in framework
8377
mkdir -p framework-arduinoespressif32/tools/slave_firmware
8478
mv slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
8579
mv framework-arduinoespressif32/release-info.txt .
8680
IDF_BRANCH=$(grep '^IDF_BRANCH=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
8781
IDF_COMMIT=$(grep '^IDF_COMMIT=' framework-arduinoespressif32/release-info.txt | cut -d'=' -f2 | tr -d '"')
8882
idf_version_string="${IDF_BRANCH//\//_}-$IDF_COMMIT"
89-
# Create final framework ZIP
90-
zip -qr framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32
83+
7z a -mx=9 -tzip -xr'!.*' framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32/
9184
9285
- name: Release framework-arduinoespressif32
9386
uses: jason2866/[email protected]

tools/archive-build.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,4 @@ cd ../tools/esp32-arduino-libs
6464
rm -rf **/flags
6565
cd ../../../
6666

67-
echo "Listing current directory:"
68-
ls -la
69-
echo "Listing dist directory:"
70-
ls -la dist/ || echo "dist directory not found"
71-
echo "Listing framework-arduinoespressif32 directory:"
72-
ls -la framework-arduinoespressif32/ || echo "framework-arduinoespressif32 directory not found"
73-
7467
# 7z a -mx=9 -tzip -xr'!.*' ../$pio_zip_archive_path framework-arduinoespressif32/

tools/prepare-ci.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
77
brew install gperf || true
88
brew install ninja || true
99
brew install ccache || true
10+
brew install 7zip || true
1011
python3 -m pip install uv
1112
uv venv
1213
uv pip install future pyelftools
1314
else
1415
echo "Linux detected. Install dependencies..."
15-
sudo apt update && sudo apt install -y gperf cmake ninja-build ccache
16+
sudo apt update && sudo apt install -y gperf cmake ninja-build ccache p7zip-full
1617
pip3 install wheel future pyelftools
1718
fi

0 commit comments

Comments
 (0)