Skip to content

Commit 77d8095

Browse files
authored
fix(release): Fix release script to use new archive method (#10255)
* fix(release): Fix release script to use new archive method * Remove variable
1 parent dd4a7d6 commit 77d8095

File tree

1 file changed

+2
-64
lines changed

1 file changed

+2
-64
lines changed

.github/scripts/on-release.sh

+2-64
Original file line numberDiff line numberDiff line change
@@ -279,68 +279,6 @@ echo "Package Uploaded"
279279
echo "Download URL: $PACKAGE_URL"
280280
echo
281281

282-
##
283-
## LIBS PACKAGE ZIP
284-
##
285-
286-
LIBS_PROJ_NAME="esp32-arduino-libs"
287-
LIBS_PKG_DIR="$OUTPUT_DIR/$LIBS_PROJ_NAME"
288-
LIBS_PACKAGE_ZIP="$LIBS_PROJ_NAME-$RELEASE_TAG.zip"
289-
290-
# Get the libs package URL from the template
291-
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-
294-
# Download the libs package
295-
echo "Downloading the libs archive ..."
296-
curl -o "$LIBS_PACKAGE_SRC_ZIP" -LJO --url "$LIBS_PACKAGE_SRC_URL" || exit 1
297-
298-
# Extract the libs package
299-
echo "Extracting the archive ..."
300-
unzip -q -d "$OUTPUT_DIR" "$LIBS_PACKAGE_SRC_ZIP" || exit 1
301-
EXTRACTED_DIR=`ls "$OUTPUT_DIR" | grep "^$LIBS_PROJ_NAME"`
302-
mv "$OUTPUT_DIR/$EXTRACTED_DIR" "$LIBS_PKG_DIR" || exit 1
303-
304-
# Remove unnecessary files in the package folder
305-
echo "Cleaning up folders ..."
306-
find "$LIBS_PKG_DIR" -name '*.DS_Store' -exec rm -f {} \;
307-
find "$LIBS_PKG_DIR" -name '*.git*' -type f -delete
308-
309-
# Compress package folder
310-
echo "Creating ZIP ..."
311-
pushd "$OUTPUT_DIR" >/dev/null
312-
zip -qr "$LIBS_PACKAGE_ZIP" "$LIBS_PROJ_NAME"
313-
if [ $? -ne 0 ]; then echo "ERROR: Failed to create $LIBS_PACKAGE_ZIP ($?)"; exit 1; fi
314-
315-
# Calculate SHA-256
316-
echo "Calculating SHA sum ..."
317-
LIBS_PACKAGE_PATH="$OUTPUT_DIR/$LIBS_PACKAGE_ZIP"
318-
LIBS_PACKAGE_SHA=`shasum -a 256 "$LIBS_PACKAGE_ZIP" | cut -f 1 -d ' '`
319-
LIBS_PACKAGE_SIZE=`get_file_size "$LIBS_PACKAGE_ZIP"`
320-
popd >/dev/null
321-
rm -rf "$LIBS_PKG_DIR"
322-
echo "'$LIBS_PACKAGE_ZIP' Created! Size: $LIBS_PACKAGE_SIZE, SHA-256: $LIBS_PACKAGE_SHA"
323-
echo
324-
325-
# Upload package to release page
326-
echo "Uploading libs package to release page ..."
327-
LIBS_PACKAGE_URL=`git_safe_upload_asset "$LIBS_PACKAGE_PATH"`
328-
echo "Libs Package Uploaded"
329-
echo "Libs Download URL: $LIBS_PACKAGE_URL"
330-
echo
331-
332-
# Construct JQ argument with libs package data
333-
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\""
338-
339-
# Update template values for the libs package and store it in the build folder
340-
cat "$PACKAGE_JSON_TEMPLATE" | jq "$libs_jq_arg" > "$OUTPUT_DIR/package-$LIBS_PROJ_NAME.json"
341-
# Overwrite the template location with the newly edited one
342-
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-$LIBS_PROJ_NAME.json"
343-
344282
##
345283
## TEMP WORKAROUND FOR RV32 LONG PATH ON WINDOWS
346284
##
@@ -364,8 +302,8 @@ rvtc_jq_arg="\
364302
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\" |\
365303
(.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).version = \"$RVTC_VERSION\" |\
366304
(.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\""
367-
cat "$PACKAGE_JSON_TEMPLATE" | jq "$rvtc_jq_arg" > "$OUTPUT_DIR/package-$LIBS_PROJ_NAME-rvfix.json"
368-
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-$LIBS_PROJ_NAME-rvfix.json"
305+
cat "$PACKAGE_JSON_TEMPLATE" | jq "$rvtc_jq_arg" > "$OUTPUT_DIR/package-rvfix.json"
306+
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-rvfix.json"
369307

370308
##
371309
## PACKAGE JSON

0 commit comments

Comments
 (0)