@@ -213,6 +213,7 @@ cp -f "$GITHUB_WORKSPACE/tools/platformio-build.py" "$PKG_DIR/tools/"
213213echo " Cleaning up folders ..."
214214find " $PKG_DIR " -name ' *.DS_Store' -exec rm -f {} \;
215215find " $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
216217
217218# #
218219# # TEMP WORKAROUND FOR RV32 LONG PATH ON WINDOWS
@@ -282,7 +283,7 @@ LIBS_PACKAGE_ZIP="$LIBS_PROJ_NAME-$RELEASE_TAG.zip"
282283
283284# Get the libs package URL from the template
284285LIBS_PACKAGE_SRC_ZIP=" $OUTPUT_DIR /src-$LIBS_PROJ_NAME .zip"
285- LIBS_PACKAGE_SRC_URL=` cat $PACKAGE_JSON_TEMPLATE | jq -r " .packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" ) | .systems[0].url" `
286+ LIBS_PACKAGE_SRC_URL=` cat $PACKAGE_JSON_TEMPLATE | jq -r " .packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" ) | .systems[0].url" `
286287
287288# Download the libs package
288289echo " Downloading the libs archive ..."
@@ -298,6 +299,7 @@ mv "$OUTPUT_DIR/$EXTRACTED_DIR" "$LIBS_PKG_DIR" || exit 1
298299echo " Cleaning up folders ..."
299300find " $LIBS_PKG_DIR " -name ' *.DS_Store' -exec rm -f {} \;
300301find " $LIBS_PKG_DIR " -name ' *.git*' -type f -delete
302+ find " $LIBS_PKG_DIR " -mindepth 1 -maxdepth 1 -type d \! -name esp32s3 -exec rm -rf {} \;
301303
302304# Compress package folder
303305echo " Creating ZIP ..."
@@ -324,10 +326,10 @@ echo
324326
325327# Construct JQ argument with libs package data
326328libs_jq_arg=" \
327- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].url = \" $LIBS_PACKAGE_URL \" |\
328- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].archiveFileName = \" $LIBS_PACKAGE_ZIP \" |\
329- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].size = \" $LIBS_PACKAGE_SIZE \" |\
330- (.packages[0 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].checksum = \" SHA-256:$LIBS_PACKAGE_SHA \" "
329+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].url = \" $LIBS_PACKAGE_URL \" |\
330+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].archiveFileName = \" $LIBS_PACKAGE_ZIP \" |\
331+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].size = \" $LIBS_PACKAGE_SIZE \" |\
332+ (.packages[1 ].tools[] | select(.name==\" $LIBS_PROJ_NAME \" )).systems[].checksum = \" SHA-256:$LIBS_PACKAGE_SHA \" "
331333
332334# Update template values for the libs package and store it in the build folder
333335cat " $PACKAGE_JSON_TEMPLATE " | jq " $libs_jq_arg " > " $OUTPUT_DIR /package-$LIBS_PROJ_NAME .json"
@@ -343,8 +345,8 @@ RVTC_VERSION=`date -d "$RVTC_VERSION" '+%y%m'`
343345rvtc_jq_arg=" \
344346 (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
345347 (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" |\
346- (.packages[0 ].tools[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
347- (.packages[0 ].tools[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" "
348+ (.packages[1 ].tools[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
349+ (.packages[1 ].tools[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" "
348350cat " $PACKAGE_JSON_TEMPLATE " | jq " $rvtc_jq_arg " > " $OUTPUT_DIR /package-$LIBS_PROJ_NAME -rvfix.json"
349351PACKAGE_JSON_TEMPLATE=" $OUTPUT_DIR /package-$LIBS_PROJ_NAME -rvfix.json"
350352
0 commit comments