Update ready step order

Author: ryanjbaxter

.github/actions/spring-release-train-project-ready/action.yml

@@ -102,24 +102,37 @@ runs:
         directory: ${{ inputs.project }}
         project-version-substitutions: '{"spring-cloud-dependencies-parent":"spring-cloud-build","verifier":"spring-cloud-contract","springBoot":"spring-boot"}'
 
+    - name: Delete CI and PR workflows from release branch
+      shell: bash
+      working-directory: ${{ inputs.project }}
+      run: |
+        for workflow in "ci.yml" "ci.yaml" "pr.yml" "pr.yaml"; do
+          if [[ -f ".github/workflows/${workflow}" ]]; then
+            git rm ".github/workflows/${workflow}"
+            echo "Staged .github/workflows/${workflow} for deletion."
+          else
+            echo ".github/workflows/${workflow} not found — skipping."
+          fi
+        done
+
     - name: Verify no snapshot versions
       uses: ./.github/actions/verify-no-snapshot-versions
       with:
         directory: ${{ inputs.project }}
 
-    - name: Commit and push release version changes
+    - name: Commit and push changes
       shell: bash
       working-directory: ${{ inputs.project }}
       run: |
         git config user.name "spring-builds"
         git config user.email "spring-builds@users.noreply.github.com"
         git add -A
         if git diff --cached --quiet; then
-          echo "No changes to commit — versions were already at release values."
+          echo "No changes to commit."
         else
-          git commit -m "Updating to release versions"
+          git commit -m "Updating to release versions and removing CI/PR workflows"
           git push
-          echo "Committed and pushed release version changes."
+          echo "Committed and pushed changes."
         fi
 
     - name: Trigger release-train-ready workflow
@@ -143,41 +156,6 @@ runs:
         fi
         exit $watch_exit_code
 
-    - name: Delete CI and PR workflows from release branch
-      shell: bash
-      run: |
-        repo="spring-cloud/${{ inputs.project }}"
-        branch="release/${{ inputs.project-version }}"
-        token="${{ inputs.token }}"
-
-        git clone --depth 1 --branch "$branch" \
-          "https://x-access-token:${token}@github.com/${repo}.git" _delete_workflows
-        cd _delete_workflows
-
-        deleted=false
-        for workflow in "ci.yml" "ci.yaml" "pr.yml" "pr.yaml"; do
-          if [[ -f ".github/workflows/${workflow}" ]]; then
-            git rm ".github/workflows/${workflow}"
-            echo "Staged .github/workflows/${workflow} for deletion."
-            deleted=true
-          else
-            echo ".github/workflows/${workflow} not found — skipping."
-          fi
-        done
-
-        if [[ "$deleted" == "true" ]]; then
-          git config user.name "spring-builds"
-          git config user.email "spring-builds@users.noreply.github.com"
-          git commit -m "Removing CI/PR workflows - release branch is ready"
-          git push
-          echo "CI/PR workflows deleted from ${branch}."
-        else
-          echo "No CI/PR workflow files found on ${branch} — nothing to delete."
-        fi
-
-        cd ..
-        rm -rf _delete_workflows
-
     - name: Remove release branch from projects.json
       shell: bash
       env: