minor improvements

Author: MatKuhr

.github/workflows/spec-update.yaml

@@ -50,6 +50,15 @@ jobs:
         with:
           token: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
 
+      - name: "Checkout or Create Branch"
+        id: branch
+        # Checkout branch if it exists, otherwise create it
+        run: |
+          BRANCH="spec-update/$CHOICE/$REF"
+          git fetch origin $BRANCH || true
+          git checkout -B $BRANCH origin/$BRANCH || git checkout -b $BRANCH
+          echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
+
       - name: "Download specification file"
         id: download
         env:
@@ -83,27 +92,6 @@ jobs:
             echo "spec_diff=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: "Checkout or Create Branch"
-        # Always create a new branch to ensure we generate from a clean state.
-        # In case a PR exist we can't delete and re-create the branch (without closing the PR first).
-        # So the workflow will exist in this case.
-        id: branch
-        env:
-          GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
-        run: |
-          BRANCH="spec-update/$CHOICE/$REF"
-          if gh pr list --head $BRANCH --json number -q '.[].number' | grep -q .; then
-            echo "An open PR already exists for this branch. Please close the PR first before re-running the workflow."
-            exit 1
-          fi
-
-          if git ls-remote --exit-code origin refs/heads/$BRANCH >/dev/null 2>&1; then
-            echo "Branch '$BRANCH' exists on remote, deleting it..."
-            git push origin --delete $BRANCH
-          fi
-          git checkout -b $BRANCH
-          echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
-
       - name: "Setup java"
         uses: actions/setup-java@v4
         if: steps.spec_diff.outputs.spec_diff == 'true'
@@ -150,8 +138,14 @@ jobs:
         if: ${{ env.CREATE_PR == 'true' && steps.spec_diff.outputs.spec_diff == 'true'}}
         env:
           GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
+          BRANCH: ${{ steps.branch.outputs.branch }}
         run: |
-          gh pr create --base main --head ${{ steps.branch.outputs.branch }} --title "feat: [DevOps] Update $CHOICE Specification" --body "
+          if gh pr list --head $BRANCH --json number -q '.[].number' | grep -q .; then
+            echo "An open PR already exists for this branch. Skipping PR creation."
+            exit 0
+          fi
+          
+          gh pr create --base main --head $BRANCH --title "feat: [DevOps] Update $CHOICE Specification" --body "
           ## Context
           
           Update $CHOICE specification file based on $REF.
@@ -173,9 +167,9 @@ jobs:
       - name: "Print Summary"
         if: ${{ always() }}
         run: |
-          echo "Branch creation: ${{ steps.branch.outcome }}"
           echo "File download outcome: ${{ steps.download.outcome }}"
           echo "Spec file contained changes: ${{ steps.spec_diff.outputs.spec_diff }}"
           echo "Client generation outcome: ${{ steps.generate.outcome }}"
           echo "Client compilation outcome: ${{ steps.compile.output.compilation_result }}"
           echo "Client test outcome: ${{ steps.compile.output.test_result }}"
+          echo "Branch creation: ${{ steps.push.outcome }}"