Skip to content

Commit 099dfa3

Browse files
authored
fix json generation
1 parent b649c4c commit 099dfa3

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

build.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,14 @@ if [ "$BUILD_TYPE" = "all" ]; then
282282
if [ $? -ne 0 ]; then exit 1; fi
283283
fi
284284

285+
pushd $IDF_PATH
286+
ibr=$(git describe --all 2>/dev/null)
287+
ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
288+
popd
289+
285290
# Generate PlatformIO library manifest file
286291
if [ "$BUILD_TYPE" = "all" ]; then
287-
python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "v$IDF_VERSION" -c "$IDF_COMMIT"
292+
python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
288293
if [ $? -ne 0 ]; then exit 1; fi
289294
fi
290295

@@ -294,7 +299,7 @@ AR_VERSION_UNDERSCORE=`echo "$AR_VERSION" | tr . _`
294299
# Generate PlatformIO framework manifest file
295300
rm -rf "$AR_ROOT/package.json"
296301
if [ "$BUILD_TYPE" = "all" ]; then
297-
python3 ./tools/gen_pio_frmwk_manifest.py -o "$AR_ROOT/" -s "v$AR_VERSION" -c "$IDF_COMMIT"
302+
python3 ./tools/gen_pio_frmwk_manifest.py -o "$AR_ROOT/" -s "v$AR_VERSION" -c "$ic"
298303
if [ $? -ne 0 ]; then exit 1; fi
299304
fi
300305

0 commit comments

Comments
 (0)