Skip to content

Commit 5accf4a

Browse files
committed
fix grep
1 parent b1162fb commit 5accf4a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

.github/workflows/parallel_build.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@ jobs:
7777
mkdir -p framework-arduinoespressif32/tools/slave_firmware
7878
mv slave_firmware/* framework-arduinoespressif32/tools/slave_firmware/
7979
mv framework-arduinoespressif32/release-info.txt .
80-
IDF_BRANCH=$(grep '^IDF_BRANCH=' release-info.txt | cut -d'=' -f2 | tr -d '"')
81-
IDF_COMMIT=$(grep '^IDF_COMMIT=' release-info.txt | cut -d'=' -f2 | tr -d '"')
80+
IDF_BRANCH=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*branch \[([^]]+)\].*/\1/')
81+
IDF_COMMIT=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*commit \[([^]]+)\].*/\1/')
82+
echo "IDF_BRANCH=$IDF_BRANCH"
83+
echo "IDF_COMMIT=$IDF_COMMIT"
8284
idf_version_string="${IDF_BRANCH//\//_}-$IDF_COMMIT"
8385
7z a -mx=9 -tzip -xr'!.*' framework-arduinoespressif32-${idf_version_string}.zip framework-arduinoespressif32/
8486
@@ -96,6 +98,6 @@ jobs:
9698
- name: Set tag name
9799
id: set_tag_name
98100
run: |
99-
IDF_VERSION=$(grep '^IDF_VERSION=' release-info.txt | cut -d'=' -f2 | cut -d'.' -f1,2 | tr -d '"')
101+
IDF_VERSION=$(grep 'esp-idf branch' release-info.txt | sed -E 's/.*branch \[release\/v([0-9]+\.[0-9]+)\].*/\1/')
100102
DATE=$(date +"%d.%m")
101103
echo "tag_name=IDF${IDF_VERSION}-${DATE}" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)