tools: Update scripts

tools/publish.sh

@@ -15,13 +15,15 @@ trap 's=$?; echo >&2 "$0: error on line "${LINENO}": ${BASH_COMMAND}"; exit ${s}
 # Note: This script requires the following tools:
 # - parse-changelog <https://github.com/taiki-e/parse-changelog>
 
-x() {
-    local cmd="$1"
-    shift
-    (
-        set -x
-        "${cmd}" "$@"
-    )
+retry() {
+    for i in {1..10}; do
+        if "$@"; then
+            return 0
+        else
+            sleep "${i}"
+        fi
+    done
+    "$@"
 }
 bail() {
     echo >&2 "error: $*"
@@ -178,10 +180,15 @@ done
 
 if [[ -n "${tags}" ]]; then
     # Create a release commit.
-    x git add "${changed_paths[@]}"
-    x git commit -m "Release ${version}"
+    (
+        set -x
+        git add "${changed_paths[@]}"
+        git commit -m "Release ${version}"
+    )
 fi
 
-x git tag "${tag}"
-x git push origin main
-x git push origin --tags
+set -x
+
+git tag "${tag}"
+retry git push origin main
+retry git push origin --tags

tools/tidy.sh

@@ -78,7 +78,7 @@ if [[ -n "$(git ls-files '*.rs')" ]]; then
         # `cargo fmt` cannot recognize files not included in the current workspace and modules
         # defined inside macros, so run rustfmt directly.
         # We need to use nightly rustfmt because we use the unstable formatting options of rustfmt.
-        rustc_version=$(rustc -Vv | grep 'release: ' | sed 's/release: //')
+        rustc_version=$(rustc -vV | grep 'release: ' | sed 's/release: //')
         if [[ "${rustc_version}" == *"nightly"* ]] || [[ "${rustc_version}" == *"dev"* ]]; then
             rustup component add rustfmt &>/dev/null
             echo "+ rustfmt \$(git ls-files '*.rs')"