Allow skipping and retrying publishing. (#557)

* Allow skipping and retrying publishing.

* Update _automate/publish.sh

Co-authored-by: David <dvdplm@gmail.com>

* Even more idempotenter.

* Apply suggestions from code review

Co-authored-by: David <dvdplm@gmail.com>

* Fetch tags before creating.

* Replace main with jsonrpc

Co-authored-by: David <dvdplm@gmail.com>

Author: tomusdrw

_automate/publish.sh

@@ -4,11 +4,22 @@ set -eu
 
 ORDER=(core server-utils tcp ws http ipc stdio pubsub core-client/transports core-client derive test)
 
-# First display the plan
-for crate in ${ORDER[@]}; do
-	cd $crate > /dev/null
+function read_toml () {
+	NAME=""
+	VERSION=""
+	NAME=$(grep "^name" ./Cargo.toml | sed -e 's/.*"\(.*\)"/\1/')
 	VERSION=$(grep "^version" ./Cargo.toml | sed -e 's/.*"\(.*\)"/\1/')
-	echo "$crate@$VERSION"
+}
+function remote_version () {
+	REMOTE_VERSION=""
+	REMOTE_VERSION=$(cargo search "$NAME" | grep "^$NAME =" | sed -e 's/.*"\(.*\)".*/\1/')
+}
+
+# First display the plan
+for CRATE_DIR in ${ORDER[@]}; do
+	cd $CRATE_DIR > /dev/null
+	read_toml
+	echo "$NAME@$VERSION"
 	cd - > /dev/null
 done
 
@@ -18,37 +29,87 @@ set -x
 
 cargo clean
 
+set +x
+
 # Then actually perform publishing.
-for crate in ${ORDER[@]}; do
-	cd $crate
-	VERSION=$(grep "^version" ./Cargo.toml | sed -e 's/.*"\(.*\)"/\1/')
-	echo "Publishing $crate@$VERSION"
-	sleep 5 # give the user an opportunity to abort before publishing
-	cargo publish $@ || read -p ">>>>> Publishing $crate failed. Press [enter] to continue. "
-  echo "  Waiting for published version $VERSION to be available..."
-	CRATE_NAME=$(grep "^name" ./Cargo.toml | sed -e 's/.*"\(.*\)"/\1/')
-	LATEST_VERSION=0
-	while [[ $LATEST_VERSION != $VERSION ]]
-	do
-	  sleep 3
-	  LATEST_VERSION=$(cargo search "$CRATE_NAME" | grep "^$CRATE_NAME =" | sed -e 's/.*"\(.*\)".*/\1/')
-	  echo "    Latest available version: $LATEST_VERSION"
+for CRATE_DIR in ${ORDER[@]}; do
+	cd $CRATE_DIR > /dev/null
+	read_toml
+	remote_version
+	# Seems the latest version matches, skip by default.
+	if [ "$REMOTE_VERSION" = "$VERSION" ] || [[ "$REMOTE_VERSION" > "$VERSION" ]]; then
+		RET=""
+		echo "Seems like $NAME@$REMOTE_VERSION is already published. Continuing in 5s. "
+		read -t 5 -p ">>>> Type [r][enter] to retry, or [enter] to continue... " RET || true
+		if [ "$RET" != "r" ]; then
+			echo "Skipping $NAME@$VERSION"
+			cd - > /dev/null
+			continue
+		fi
+	fi
+
+	# Attempt to publish (allow retries)
+	while : ; do
+		# give the user an opportunity to abort or skip before publishing
+		echo "🚀 Publishing $NAME@$VERSION..."
+		sleep 3
+
+		set +e && set -x
+		cargo publish $@
+		RES=$?
+		set +x && set -e
+		# Check if it succeeded
+		if [ "$RES" != "0" ]; then
+			CHOICE=""
+			echo "##### Publishing $NAME failed"
+			read -p ">>>>> Type [s][enter] to skip, or [enter] to retry.. " CHOICE
+			if [ "$CHOICE" = "s" ]; then
+				break
+			fi
+		fi
+	done
+
+	# Wait again to make sure that the new version is published and available.
+	echo "Waiting for $NAME@$VERSION to become available at the registry..."
+	while : ; do
+		sleep 3
+		remote_version
+		if [ "$REMOTE_VERSION" = "$VERSION" ]; then
+			echo "🥳 $NAME@$VERSION published succesfully."
+			sleep 3
+			break
+		else
+			echo "#### Got $NAME@$REMOTE_VERSION but expected $NAME@$VERSION. Retrying..."
+		fi
 	done
-	cd -
+	cd - > /dev/null
 done
 
 # Make tags in one go
-for crate in ${ORDER[@]}; do
-	cd $crate
-	VERSION=$(grep "^version" ./Cargo.toml | sed -e 's/.*"\(.*\)"/\1/')
-	echo "Tagging $crate@$VERSION"
-	git tag -a "$crate-$VERSION" -m "$crate $VERSION" || true
-	cd -
+set -x
+git fetch --tags
+set +x
+
+for CRATE_DIR in ${ORDER[@]}; do
+	cd $CRATE_DIR > /dev/null
+	read_toml
+	echo "Tagging $NAME@$VERSION"
+	set -x
+	git tag -a "$NAME-$VERSION" -m "$NAME $VERSION" || true
+	set +x
+	cd - > /dev/null
 done
 
+set -x
+sleep 3
 git push --tags
+set +x
 
-VERSION=$(grep "^version" ./core/Cargo.toml | sed -e 's/.*"\(.*\)"/\1/')
-echo "Tagging main $VERSION"
+cd core > /dev/null
+read_toml
+cd - > /dev/null
+echo "Tagging jsonrpc@$VERSION"
+set -x
 git tag -a v$VERSION -m "Version $VERSION"
+sleep 3
 git push --tags