@@ -213,6 +213,7 @@ cp -f "$GITHUB_WORKSPACE/tools/platformio-build.py" "$PKG_DIR/tools/"
213
213
echo " Cleaning up folders ..."
214
214
find " $PKG_DIR " -name ' *.DS_Store' -exec rm -f {} \;
215
215
find " $PKG_DIR " -name ' *.git*' -type f -delete
216
+ find " $PKG_DIR " -name ' .skip.esp32s3' -type f -exec bash -c ' echo rm -rf $(dirname "{}")' \; | tac | /bin/bash
216
217
217
218
# #
218
219
# # TEMP WORKAROUND FOR RV32 LONG PATH ON WINDOWS
@@ -289,7 +290,7 @@ LIBS_PACKAGE_ZIP="$LIBS_PROJ_NAME-$RELEASE_TAG.zip"
289
290
290
291
# Get the libs package URL from the template
291
292
LIBS_PACKAGE_SRC_ZIP=" $OUTPUT_DIR /src-$LIBS_PROJ_NAME .zip"
292
- LIBS_PACKAGE_SRC_URL=` cat $PACKAGE_JSON_TEMPLATE | jq -r " .packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" ) | .systems[0].url" `
293
+ LIBS_PACKAGE_SRC_URL=` cat $PACKAGE_JSON_TEMPLATE | jq -r " .packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" ) | .systems[0].url" `
293
294
294
295
# Download the libs package
295
296
echo " Downloading the libs archive ..."
@@ -305,6 +306,7 @@ mv "$OUTPUT_DIR/$EXTRACTED_DIR" "$LIBS_PKG_DIR" || exit 1
305
306
echo " Cleaning up folders ..."
306
307
find " $LIBS_PKG_DIR " -name ' *.DS_Store' -exec rm -f {} \;
307
308
find " $LIBS_PKG_DIR " -name ' *.git*' -type f -delete
309
+ find " $LIBS_PKG_DIR " -mindepth 1 -maxdepth 1 -type d \! -name esp32s3 -exec rm -rf {} \;
308
310
309
311
# Compress package folder
310
312
echo " Creating ZIP ..."
@@ -331,10 +333,10 @@ echo
331
333
332
334
# Construct JQ argument with libs package data
333
335
libs_jq_arg=" \
334
- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].url = \" $LIBS_PACKAGE_URL \" |\
335
- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].archiveFileName = \" $LIBS_PACKAGE_ZIP \" |\
336
- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].size = \" $LIBS_PACKAGE_SIZE \" |\
337
- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].checksum = \" SHA-256:$LIBS_PACKAGE_SHA \" "
336
+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].url = \" $LIBS_PACKAGE_URL \" |\
337
+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].archiveFileName = \" $LIBS_PACKAGE_ZIP \" |\
338
+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].size = \" $LIBS_PACKAGE_SIZE \" |\
339
+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].checksum = \" SHA-256:$LIBS_PACKAGE_SHA \" "
338
340
339
341
# Update template values for the libs package and store it in the build folder
340
342
cat " $PACKAGE_JSON_TEMPLATE " | jq " $libs_jq_arg " > " $OUTPUT_DIR /package-$LIBS_PROJ_NAME .json"
@@ -350,20 +352,20 @@ RVTC_VERSION=`date -d "$RVTC_VERSION" '+%y%m'`
350
352
rvtc_jq_arg=" \
351
353
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
352
354
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" |\
353
- (.packages[0 ].tools[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
354
- (.packages[0 ].tools[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" |\
355
+ (.packages[1 ].tools[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
356
+ (.packages[1 ].tools[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" |\
355
357
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $X32TC_NAME \" )).version = \" $RVTC_VERSION \" |\
356
358
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $X32TC_NAME \" )).name = \" $X32TC_NEW_NAME \" |\
357
- (.packages[0 ].tools[] | select(.name==\" $X32TC_NAME \" )).version = \" $RVTC_VERSION \" |\
358
- (.packages[0 ].tools[] | select(.name==\" $X32TC_NAME \" )).name = \" $X32TC_NEW_NAME \" |\
359
+ (.packages[1 ].tools[] | select(.name==\" $X32TC_NAME \" )).version = \" $RVTC_VERSION \" |\
360
+ (.packages[1 ].tools[] | select(.name==\" $X32TC_NAME \" )).name = \" $X32TC_NEW_NAME \" |\
359
361
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS2TC_NAME \" )).version = \" $RVTC_VERSION \" |\
360
362
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS2TC_NAME \" )).name = \" $XS2TC_NEW_NAME \" |\
361
- (.packages[0 ].tools[] | select(.name==\" $XS2TC_NAME \" )).version = \" $RVTC_VERSION \" |\
362
- (.packages[0 ].tools[] | select(.name==\" $XS2TC_NAME \" )).name = \" $XS2TC_NEW_NAME \" |\
363
+ (.packages[1 ].tools[] | select(.name==\" $XS2TC_NAME \" )).version = \" $RVTC_VERSION \" |\
364
+ (.packages[1 ].tools[] | select(.name==\" $XS2TC_NAME \" )).name = \" $XS2TC_NEW_NAME \" |\
363
365
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS3TC_NAME \" )).version = \" $RVTC_VERSION \" |\
364
366
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS3TC_NAME \" )).name = \" $XS3TC_NEW_NAME \" |\
365
- (.packages[0 ].tools[] | select(.name==\" $XS3TC_NAME \" )).version = \" $RVTC_VERSION \" |\
366
- (.packages[0 ].tools[] | select(.name==\" $XS3TC_NAME \" )).name = \" $XS3TC_NEW_NAME \" "
367
+ (.packages[1 ].tools[] | select(.name==\" $XS3TC_NAME \" )).version = \" $RVTC_VERSION \" |\
368
+ (.packages[1 ].tools[] | select(.name==\" $XS3TC_NAME \" )).name = \" $XS3TC_NEW_NAME \" "
367
369
cat " $PACKAGE_JSON_TEMPLATE " | jq " $rvtc_jq_arg " > " $OUTPUT_DIR /package-$LIBS_PROJ_NAME -rvfix.json"
368
370
PACKAGE_JSON_TEMPLATE=" $OUTPUT_DIR /package-$LIBS_PROJ_NAME -rvfix.json"
369
371
0 commit comments