Improve the commit logic on windows for the libraries

Author: JCash

.github/actions/rive-build/action.yml

@@ -145,15 +145,22 @@ runs:
           msg="$msg - ${COMMIT_SUFFIX}"
         fi
         git commit -m "$msg"
+        git config http.version HTTP/1.1
         max_attempts=3
         attempt=1
         until [ $attempt -gt $max_attempts ]; do
           echo "Attempt $attempt: rebase + push"
           if git pull --rebase origin "${GITHUB_REF_NAME}"; then
+            local_sha="$(git rev-parse HEAD)"
             if git push origin HEAD:"${GITHUB_REF_NAME}"; then
               echo "Push succeeded"
               break
             fi
+            remote_sha="$(git ls-remote origin "refs/heads/${GITHUB_REF_NAME}" | awk '{print $1}' || true)"
+            if [ -n "${remote_sha}" ] && [ "${remote_sha}" = "${local_sha}" ]; then
+              echo "Remote branch already points at ${local_sha}; treating push as successful."
+              break
+            fi
           else
             echo "Rebase failed; aborting and retrying"
             git rebase --abort || true

.github/workflows/branch-artifacts.yml

@@ -454,15 +454,22 @@ jobs:
             msg="$msg - ${{ github.event.inputs.commit_message }}"
           fi
           git commit -m "$msg"
+          git config http.version HTTP/1.1
           max_attempts=3
           attempt=1
           until [ $attempt -gt $max_attempts ]; do
             echo "Attempt $attempt: rebase + push"
             if git pull --rebase origin "${{ github.ref_name }}"; then
+              local_sha="$(git rev-parse HEAD)"
               if git push origin HEAD:"${{ github.ref_name }}"; then
                 echo "Push succeeded"
                 break
               fi
+              remote_sha="$(git ls-remote origin "refs/heads/${{ github.ref_name }}" | awk '{print $1}' || true)"
+              if [ -n "${remote_sha}" ] && [ "${remote_sha}" = "${local_sha}" ]; then
+                echo "Remote branch already points at ${local_sha}; treating push as successful."
+                break
+              fi
             else
               echo "Rebase failed; aborting and retrying"
               git rebase --abort || true
@@ -593,15 +600,22 @@ jobs:
             msg="$msg - ${{ github.event.inputs.commit_message }}"
           fi
           git commit -m "$msg"
+          git config http.version HTTP/1.1
           max_attempts=3
           attempt=1
           until [ $attempt -gt $max_attempts ]; do
             echo "Attempt $attempt: rebase + push"
             if git pull --rebase origin "${{ github.ref_name }}"; then
+              local_sha="$(git rev-parse HEAD)"
               if git push origin HEAD:"${{ github.ref_name }}"; then
                 echo "Push succeeded"
                 break
               fi
+              remote_sha="$(git ls-remote origin "refs/heads/${{ github.ref_name }}" | awk '{print $1}' || true)"
+              if [ -n "${remote_sha}" ] && [ "${remote_sha}" = "${local_sha}" ]; then
+                echo "Remote branch already points at ${local_sha}; treating push as successful."
+                break
+              fi
             else
               echo "Rebase failed; aborting and retrying"
               git rebase --abort || true
@@ -710,15 +724,22 @@ jobs:
             msg="$msg - ${{ github.event.inputs.commit_message }}"
           fi
           git commit -m "$msg"
+          git config http.version HTTP/1.1
           max_attempts=3
           attempt=1
           until [ $attempt -gt $max_attempts ]; do
             echo "Attempt $attempt: rebase + push"
             if git pull --rebase origin "${{ github.ref_name }}"; then
+              local_sha="$(git rev-parse HEAD)"
               if git push origin HEAD:"${{ github.ref_name }}"; then
                 echo "Push succeeded"
                 break
               fi
+              remote_sha="$(git ls-remote origin "refs/heads/${{ github.ref_name }}" | awk '{print $1}' || true)"
+              if [ -n "${remote_sha}" ] && [ "${remote_sha}" = "${local_sha}" ]; then
+                echo "Remote branch already points at ${local_sha}; treating push as successful."
+                break
+              fi
             else
               echo "Rebase failed; aborting and retrying"
               git rebase --abort || true