fix(upload): Add delays and improve error checking (#265)

Author: lucasssvaz

tools/config.sh

@@ -203,8 +203,11 @@ function github_release_asset_upload(){ # github_release_asset_upload <repo-path
 function github_release_asset_delete(){ # github_release_asset_delete <repo-path> <release-asset-id>
     local repo_path="$1"
     local release_asset_id="$2"
-    local res=$(curl -s -k -o /dev/null -w "%{http_code}" -X DELETE -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" "https://api.github.com/repos/$repo_path/releases/assets/$release_asset_id")
-    if [ "$res" -eq 204 ]; then echo 1; else echo 0; fi
+    local res
+    local return_code
+    res=$(curl -s -k -o /dev/null -w "%{http_code}" -X DELETE -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" "https://api.github.com/repos/$repo_path/releases/assets/$release_asset_id")
+    return_code=$?
+    if [ "$res" -eq 204 ] && [ "$return_code" -eq 0 ] ; then echo 1; else echo 0; fi
 }
 
 

tools/push-to-arduino.sh

@@ -47,16 +47,22 @@ if [ $AR_HAS_COMMIT == "0" ] || [ $LIBS_HAS_ASSET == "0" ]; then
 		fi
 	fi
 
+	sleep 5
 	echo "Creating asset '$LIBS_ZIP_FILENAME'..."
-
 	mv -f "dist/esp32-arduino-libs.zip" "dist/$LIBS_ZIP_FILENAME"
+
 	LIBS_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_ZIP_FILENAME" "dist/$LIBS_ZIP_FILENAME"`
 	if [ -z "$LIBS_ASSET_ID" ]; then
-		echo "ERROR: Failed to upload asset '$LIBS_ZIP_FILENAME'"
-		exit 1
+		echo "ERROR: Failed to upload asset '$LIBS_ZIP_FILENAME. Retrying..."
+		LIBS_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_ZIP_FILENAME" "dist/$LIBS_ZIP_FILENAME"`
+		if [ -z "$LIBS_ASSET_ID" ]; then
+			echo "ERROR: Failed to upload asset '$LIBS_ZIP_FILENAME'"
+			exit 1
+		fi
 	fi
 
 	echo "Finished uploading asset '$LIBS_ZIP_FILENAME'. Asset ID: $LIBS_ASSET_ID"
+	sleep 5
 
 	# Calculate the local file checksum and size
 	local_checksum=$(sha256sum "dist/$LIBS_ZIP_FILENAME" | awk '{print $1}')
@@ -108,8 +114,12 @@ if [ $AR_HAS_COMMIT == "0" ] || [ $LIBS_HAS_ASSET == "0" ]; then
 
 	JSON_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_JSON_FILENAME" "$AR_OUT/package_esp32_index.template.json"`
 	if [ -z "$JSON_ASSET_ID" ]; then
-		echo "ERROR: Failed to upload asset '$LIBS_JSON_FILENAME'"
-		exit 1
+		echo "ERROR: Failed to upload asset '$LIBS_JSON_FILENAME'. Retrying..."
+		JSON_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_JSON_FILENAME" "$AR_OUT/package_esp32_index.template.json"`
+		if [ -z "$JSON_ASSET_ID" ]; then
+			echo "ERROR: Failed to upload asset '$LIBS_JSON_FILENAME'"
+			exit 1
+		fi
 	fi
 fi