Update workflows from templates.

Author: leeroy-travis

.github/workflows/bump-version.yaml

@@ -38,34 +38,30 @@ jobs:
         git config --global user.name "Leeroy Travis"
 
         '
-    - name: Get version
-      id: current
-      run: echo "version=$(.github/bump-version.get.sh)" >> "$GITHUB_OUTPUT"
-    - name: Compute versions
-      id: versions
-      run: .github/bump-version.bump.sh "${{ env.MODE }}" "${{ steps.current.outputs.version
-        }}" ${{ github.event.inputs.version }}
-    - name: Set release version
-      run: '.github/bump-version.set.sh "${{ steps.versions.outputs.release }}"
-
-        git diff --cached
-
-        '
-    - name: Commit release
-      run: 'git commit -m "${COMMIT_PREFIX}Set release version ${{ steps.versions.outputs.release
-        }}"
-
-        '
-    - name: Tag release
-      run: 'git tag "${{ steps.versions.outputs.release }}"
-
-        '
-    - name: Push release tag
-      run: 'git push origin "${{ github.ref }}"
-
-        git push origin "${{ steps.versions.outputs.release }}"
-
-        '
+    - name: Release
+      id: release
+      run: "set -x\nRETRIES=10\nTRY=0\nwhile [ $TRY -lt $RETRIES ] ; do\n  TRY=$(expr\
+        \ $TRY + 1)\n  # Get the current version.\n  CURRENT=$(.github/bump-version.get.sh)\n\
+        \  # Calculate next release version, and next dev version. Output to $GITHUB_OUTPUT,\
+        \ which we then read.\n  .github/bump-version.bump.sh \"${{ env.MODE }}\"\
+        \ \"${CURRENT}\" ${{ github.event.inputs.version }}\n  . $GITHUB_OUTPUT\n\
+        \  # Set the in-tree version to the release version.\n  .github/bump-version.set.sh\
+        \ \"${release}\"\n  git diff --cached\n  # GHA intermixes the stdout from\
+        \ git diff with stderr from \"set -x\", so we pause to let it settle.\n  sleep\
+        \ 1\n  git commit -m \"${COMMIT_PREFIX}Set release version ${release}\"\n\
+        \  git tag \"${release}\"\n\n  # Bump to the next development version.\n \
+        \ .github/bump-version.set.sh \"${bumped}\"\n  git diff --cached\n  sleep\
+        \ 1\n  git commit -m \"${COMMIT_PREFIX}Bump to next development version ${bumped}\"\
+        \n\n  # If we push the release commit and its tag in one step, we hit strange\
+        \ race conditions where one client succeeds\n  # pushing the tag, and another\
+        \ client succeeds pushing the commit. Instead, we push the commit first and\
+        \ then the tag.\n  # That seems to cause the loser of the race to fail early.\n\
+        \  if git push origin \"${{ github.ref }}\" && git push origin \"${release}\"\
+        \ ; then\n    break\n  fi\n\n  # If the \"git push\" failed, then let's forget\
+        \ our last two commits, re-pull the latest changes, and try again.\n  git\
+        \ reset --hard HEAD~2\n  git tag -d \"${release}\"\n  git pull origin \"${{\
+        \ github.ref }}\"\n  # Wait a little bit to let competing workflows finish\
+        \ their business.\n  sleep 10\ndone\n"
     - name: Generate release text
       id: release-body
       run: "set -x\n# Get the most recent commit. Hopefully it was a PR merge.\nCOMMIT=$(jq\
@@ -84,18 +80,5 @@ jobs:
       with:
         token: ${{ secrets.WORKFLOW_PAT }}
         prerelease: true
-        tag: ${{ steps.versions.outputs.release }}
+        tag: ${{ steps.release.outputs.release }}
         body: ${{ steps.release-body.outputs.body }}
-    - name: Set development version
-      run: '.github/bump-version.set.sh "${{ steps.versions.outputs.bumped }}"
-
-        git diff --cached
-
-        '
-    - name: Commit and push development version
-      run: 'git commit -m "${COMMIT_PREFIX}Bump to next development version ${{ steps.versions.outputs.bumped
-        }}"
-
-        git push origin main
-
-        '