Update schema generation to handle case where there is already a PR open

Author: IsakNaslundBh

.github/workflows/schema-generation.yml

@@ -4,17 +4,48 @@ on:
   schedule:
     - cron: '0 1 * * 6'  # Saturday at 1 AM UTC
   workflow_dispatch:
+    
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  TARGET_BRANCH: schema-updates
+  # This branch is used for automatic schema updates
+  FALLBACK_BRANCH: develop
 
 jobs:
   generate-schemas:
     runs-on: windows-latest
 
     steps:
-    - name: Checkout develop branch
+    - name: Resolve branch to use
+      id: resolve_branch
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        TARGET_BRANCH: ${{ env.TARGET_BRANCH }}
+        FALLBACK_BRANCH: ${{ env.FALLBACK_BRANCH }}
+      run: |
+        $REPO = "github.com/$env:GITHUB_REPOSITORY"
+        $targetBranchExists = git ls-remote --heads "https://x-access-token:$env:GITHUB_TOKEN@$REPO" $env:TARGET_BRANCH
+        if ($targetBranchExists) {
+          "branch=$env:TARGET_BRANCH" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          Write-Host "Using existing branch: $env:TARGET_BRANCH"
+        } else {
+          "branch=$env:FALLBACK_BRANCH" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          Write-Host "Using fallback branch: $env:FALLBACK_BRANCH"
+        }
+      shell: powershell
+        
+    - name: Checkout repository
       uses: actions/checkout@v4
       with:
-        ref: develop
         token: ${{ secrets.GITHUB_TOKEN }}
+        ref: ${{ steps.resolve_branch.outputs.branch }}
+        fetch-depth: 0
+        
+    - name: Show which branch was used
+      run: "echo \"Using branch: ${{ steps.resolve_branch.outputs.branch }}\""
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
@@ -304,55 +335,46 @@ jobs:
         }
       shell: powershell
 
-    - name: Create Pull Request
+    - name: Commit and push changes
       if: steps.check-changes.outputs.has_changes == 'true'
       run: |
         # Configure git
-        git config --global user.name 'github-actions[bot]'
-        git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-        
-        # Create and switch to new branch
-        $branchName = "schema-updates"
-        git checkout -b $branchName
-        
-        # Commit changes
+        git config --global user.name "github-actions[bot]"
+        git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+        # Create and checkout target branch (or switch if exists)
+        $branch_name = "${{ env.TARGET_BRANCH }}"
+        git checkout $branch_name 2>$null || git checkout -b $branch_name
+
+        # Add all changes (including new files and directories)
         git add -A
-        git commit -m "Automated schema generation update
-        
-        Generated on $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss UTC')
-        
-        This PR contains automatically generated JSON schema updates based on the latest BHoM repositories."
-        
-        # Push branch
-        git push origin $branchName --force
-        
-        # Create pull request using GitHub CLI
-        $prTitle = "Automated Schema Updates - $(Get-Date -Format 'yyyy-MM-dd')"
-        $prBody = @"
-        ## Automated Schema Generation
-        
-        This pull request contains automatically generated JSON schema updates.
-        
-        **Generation Details:**
-        - Generated on: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss UTC')
-        - Workflow run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        
-        **Changes:**
-        The schemas have been regenerated based on the latest versions of all BHoM repositories listed in ``Included-repositories.txt``.
-        
-        Please review the changes before merging.
-        "@
-        
-        # Install GitHub CLI if not available
-        if (-not (Get-Command gh -ErrorAction SilentlyContinue)) {
-          Write-Host "Installing GitHub CLI..."
-          winget install --id GitHub.cli
+
+        # Check if there are any changes to commit
+        $changes = git status --porcelain
+        if ($changes) {
+          Write-Host "Changes detected, committing..."
+          git commit -m "Automated schema generation update - $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')`n`nGenerated on $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss UTC')`n`nThis commit contains automatically generated JSON schema updates based on the latest BHoM repositories."
+
+          # Push the branch
+          git push origin $branch_name
+          Write-Host "Successfully pushed changes to branch: $branch_name"
+
+          # Check if a PR already exists for this branch
+          $existingPr = gh pr list --head $branch_name --base develop --json number --jq '.[0].number'
+          if ($existingPr) {
+            Write-Host "PR already exists (#$existingPr), adding a comment..."
+            gh pr comment $existingPr --body "Automated schema generation updates pushed to branch '$branch_name' on $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')."
+            Write-Host "✓ Comment added to existing PR"
+          } else {
+            Write-Host "Creating pull request..."
+            $prTitle = "Automated Schema Updates - $(Get-Date -Format 'yyyy-MM-dd')"
+            $prBody = "## Automated Schema Generation`n`nThis pull request contains automatically generated JSON schema updates.`n`n**Generation Details:**`n- Generated on: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss UTC')`n- Workflow run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}`n`n**Changes:**`nThe schemas have been regenerated based on the latest versions of all BHoM repositories listed in \`\`Included-repositories.txt\`\`.`n`nPlease review the changes before merging."
+            gh pr create --title "$prTitle" --body "$prBody" --head $branch_name --base develop
+            Write-Host "✓ Pull request created successfully"
+          }
+        } else {
+          Write-Host "No changes to commit"
         }
-        
-        # Create PR
-        $env:GH_TOKEN = "${{ secrets.GITHUB_TOKEN }}"
-        gh pr create --title "$prTitle" --body "$prBody" --base develop --head $branchName
-        
-      shell: powershell
+      shell: pwsh
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}