From 0310ff7af8f88b18558e6a244391efdf40473e38 Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:41:50 -0300 Subject: [PATCH 1/2] fix(release): Fix release script to use new archive method --- .github/scripts/on-release.sh | 63 +---------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/.github/scripts/on-release.sh b/.github/scripts/on-release.sh index eb8f2be7b81..42a2c6f8980 100755 --- a/.github/scripts/on-release.sh +++ b/.github/scripts/on-release.sh @@ -279,71 +279,10 @@ echo "Package Uploaded" echo "Download URL: $PACKAGE_URL" echo -## -## LIBS PACKAGE ZIP -## - -LIBS_PROJ_NAME="esp32-arduino-libs" -LIBS_PKG_DIR="$OUTPUT_DIR/$LIBS_PROJ_NAME" -LIBS_PACKAGE_ZIP="$LIBS_PROJ_NAME-$RELEASE_TAG.zip" - -# Get the libs package URL from the template -LIBS_PACKAGE_SRC_ZIP="$OUTPUT_DIR/src-$LIBS_PROJ_NAME.zip" -LIBS_PACKAGE_SRC_URL=`cat $PACKAGE_JSON_TEMPLATE | jq -r ".packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\") | .systems[0].url"` - -# Download the libs package -echo "Downloading the libs archive ..." -curl -o "$LIBS_PACKAGE_SRC_ZIP" -LJO --url "$LIBS_PACKAGE_SRC_URL" || exit 1 - -# Extract the libs package -echo "Extracting the archive ..." -unzip -q -d "$OUTPUT_DIR" "$LIBS_PACKAGE_SRC_ZIP" || exit 1 -EXTRACTED_DIR=`ls "$OUTPUT_DIR" | grep "^$LIBS_PROJ_NAME"` -mv "$OUTPUT_DIR/$EXTRACTED_DIR" "$LIBS_PKG_DIR" || exit 1 - -# Remove unnecessary files in the package folder -echo "Cleaning up folders ..." -find "$LIBS_PKG_DIR" -name '*.DS_Store' -exec rm -f {} \; -find "$LIBS_PKG_DIR" -name '*.git*' -type f -delete - -# Compress package folder -echo "Creating ZIP ..." -pushd "$OUTPUT_DIR" >/dev/null -zip -qr "$LIBS_PACKAGE_ZIP" "$LIBS_PROJ_NAME" -if [ $? -ne 0 ]; then echo "ERROR: Failed to create $LIBS_PACKAGE_ZIP ($?)"; exit 1; fi - -# Calculate SHA-256 -echo "Calculating SHA sum ..." -LIBS_PACKAGE_PATH="$OUTPUT_DIR/$LIBS_PACKAGE_ZIP" -LIBS_PACKAGE_SHA=`shasum -a 256 "$LIBS_PACKAGE_ZIP" | cut -f 1 -d ' '` -LIBS_PACKAGE_SIZE=`get_file_size "$LIBS_PACKAGE_ZIP"` -popd >/dev/null -rm -rf "$LIBS_PKG_DIR" -echo "'$LIBS_PACKAGE_ZIP' Created! Size: $LIBS_PACKAGE_SIZE, SHA-256: $LIBS_PACKAGE_SHA" -echo - -# Upload package to release page -echo "Uploading libs package to release page ..." -LIBS_PACKAGE_URL=`git_safe_upload_asset "$LIBS_PACKAGE_PATH"` -echo "Libs Package Uploaded" -echo "Libs Download URL: $LIBS_PACKAGE_URL" -echo - -# Construct JQ argument with libs package data -libs_jq_arg="\ - (.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].url = \"$LIBS_PACKAGE_URL\" |\ - (.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].archiveFileName = \"$LIBS_PACKAGE_ZIP\" |\ - (.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].size = \"$LIBS_PACKAGE_SIZE\" |\ - (.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].checksum = \"SHA-256:$LIBS_PACKAGE_SHA\"" - -# Update template values for the libs package and store it in the build folder -cat "$PACKAGE_JSON_TEMPLATE" | jq "$libs_jq_arg" > "$OUTPUT_DIR/package-$LIBS_PROJ_NAME.json" -# Overwrite the template location with the newly edited one -PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-$LIBS_PROJ_NAME.json" - ## ## TEMP WORKAROUND FOR RV32 LONG PATH ON WINDOWS ## +LIBS_PROJ_NAME="esp32-arduino-libs" RVTC_VERSION=`cat $PACKAGE_JSON_TEMPLATE | jq -r ".packages[0].platforms[0].toolsDependencies[] | select(.name == \"$RVTC_NAME\") | .version" | cut -d '_' -f 2` # RVTC_VERSION=`date -j -f '%Y%m%d' "$RVTC_VERSION" '+%y%m'` # MacOS RVTC_VERSION=`date -d "$RVTC_VERSION" '+%y%m'` From eea7b74a1dd49f52741e53f85af3d44eba997e3f Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:46:17 -0300 Subject: [PATCH 2/2] Remove variable --- .github/scripts/on-release.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/on-release.sh b/.github/scripts/on-release.sh index 42a2c6f8980..992f68fd38b 100755 --- a/.github/scripts/on-release.sh +++ b/.github/scripts/on-release.sh @@ -282,7 +282,6 @@ echo ## ## TEMP WORKAROUND FOR RV32 LONG PATH ON WINDOWS ## -LIBS_PROJ_NAME="esp32-arduino-libs" RVTC_VERSION=`cat $PACKAGE_JSON_TEMPLATE | jq -r ".packages[0].platforms[0].toolsDependencies[] | select(.name == \"$RVTC_NAME\") | .version" | cut -d '_' -f 2` # RVTC_VERSION=`date -j -f '%Y%m%d' "$RVTC_VERSION" '+%y%m'` # MacOS RVTC_VERSION=`date -d "$RVTC_VERSION" '+%y%m'` @@ -303,8 +302,8 @@ rvtc_jq_arg="\ (.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\" |\ (.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).version = \"$RVTC_VERSION\" |\ (.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\"" -cat "$PACKAGE_JSON_TEMPLATE" | jq "$rvtc_jq_arg" > "$OUTPUT_DIR/package-$LIBS_PROJ_NAME-rvfix.json" -PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-$LIBS_PROJ_NAME-rvfix.json" +cat "$PACKAGE_JSON_TEMPLATE" | jq "$rvtc_jq_arg" > "$OUTPUT_DIR/package-rvfix.json" +PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-rvfix.json" ## ## PACKAGE JSON