92 polarion check should not fail if no pr exits (#93)

danielsiegl · web-flow · commit 83876394308f · 2026-04-02T17:13:39.000+02:00
* Improved validation if a PR exits or not

* Add PR context check to workflow and conditionally find pull request

* Update GitHub Actions to latest versions in workflow YAML files

* Trying to fix this.

* Improve PR detection by checking event context and matching head branch

* Improve branch extraction from github.ref and add detailed logging for PR search

* Remove extraneous closing bracket in find PR step of workflow
diff --git a/.github/workflows/AddRebaseInstructionsOnPROpen.yml b/.github/workflows/AddRebaseInstructionsOnPROpen.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add rebase instructions to PR body
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const instructions = `
diff --git a/.github/workflows/PublishReviewSession.yml b/.github/workflows/PublishReviewSession.yml
@@ -63,7 +63,7 @@ jobs:
 
       - name: Create sessionfile name
         id: session_file
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |
@@ -95,7 +95,7 @@ jobs:
           
       - name: Post new model comment to PR
         if: steps.baseDownload.outputs.result == 'notFound'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const COMMENT_MARKER = '<!-- lemontree-review -->';
@@ -150,7 +150,7 @@ jobs:
           lta-dir: ${{ env.LTA_DIR }}
       
       - name: Publish Model Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.0
         with:
           name: ModelFiles
           path: .\*.qeax
@@ -292,22 +292,22 @@ jobs:
 
       - name: Archive Session Files
         if: steps.baseDownload.outputs.result == 'downloaded'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.0
         with:
           name: Review Session File
           path: ${{ steps.session_file.outputs.result }}
           retention-days: 2
 
       - name: Archive DiffReport.xml
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.0
         with:
                 name: DiffReport
                 path: ${{ env.DiffReportFilename }}
                 retention-days: 2
 
       - name: Create PR comment
         if: steps.baseDownload.outputs.result == 'downloaded'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const COMMENT_MARKER = '<!-- lemontree-review -->';
diff --git a/.github/workflows/RebasePRByComments.yml b/.github/workflows/RebasePRByComments.yml
@@ -30,7 +30,7 @@ jobs:
     
     steps:
       - name: Post start message in PR
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             await github.rest.issues.createComment({
@@ -42,7 +42,7 @@ jobs:
             
       - name: Retrieve Rull Request details
         id: pr_details
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |
@@ -175,7 +175,7 @@ jobs:
            
       - name: Create Finish Message in PR
         if: always()
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             await github.rest.issues.createComment({
diff --git a/.github/workflows/ReviewModelCheck.yml b/.github/workflows/ReviewModelCheck.yml
@@ -101,7 +101,7 @@ jobs:
 
       - name: Post Model Check Results to PR
         if: github.event_name == 'pull_request' && always()
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const fs = require('fs');
diff --git a/.github/workflows/ReviewPolarionRequirements.yml b/.github/workflows/ReviewPolarionRequirements.yml
@@ -152,14 +152,14 @@ jobs:
           $prNumber = if ('${{ github.event.pull_request.number }}' -eq '') { '' } else { '${{ github.event.pull_request.number }}' }
           & .\scripts\ProcessSvgDiagrams.ps1 -DiffReportFilename "${{env.DiffReportFilename}}" -GitUserName "${{env.GitUserName}}" -GitUserEmail "${{env.GitUserEmail}}" -PullRequestNumber "$prNumber" -RepositoryName "${{github.repository}}"
       - name: Publish DiffReport.xml
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.0
         with:
                 name: DiffReport
                 path: .\*.xml
                 retention-days: 2
 
       - name: Publish SessionFile
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.0
         with:
               name: SessionFile
               path: .\*.ltsfs
@@ -196,26 +196,72 @@ jobs:
       - name: Extract branch name
         id: extract_branch
         run: |
-          Write-Output "branch=$env:GITHUB_HEAD_REF" >> $env:GITHUB_OUTPUT
+          $branch = git branch --show-current
+          Write-Output "branch=$branch" >> $env:GITHUB_OUTPUT
+          Write-Output "Current branch: $branch"
         
       - name: Print Session URL
         run: |
           Write-Output "${{steps.uploadSession.outputs.SessionURL}}"
 
-      - name: Find Pull Request
-        uses: juliangruber/find-pull-request-action@v1
-        id: find-pull-request
+      - name: Find and validate Pull Request
+        id: find-pr
+        uses: actions/github-script@v8
         with:
-           branch: ${{steps.extract_branch.outputs.branch }}
+          result-encoding: string
+          script: |
+            // Extract branch name from github.ref
+            const ref = context.ref;
+            const branch = ref.startsWith('refs/heads/') ? ref.slice('refs/heads/'.length) : ref;
+            console.log(`GitHub ref: ${ref}`);
+            console.log(`Extracted branch: ${branch}`);
+            
+            // First check if we have a PR context from the event
+            if (context.payload.pull_request) {
+              const pr = context.payload.pull_request;
+              console.log(`Found PR from event context: #${pr.number}`);
+              core.setOutput('pr_exists', 'true');
+              core.setOutput('pr_number', pr.number);
+              return;
+            }
+            
+            console.log(`Searching for open PRs with head ref: ${branch}`);
+            
+            // Search for open PRs with matching head ref
+            const prs = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              per_page: 100
+            });
+            
+            console.log(`Found ${prs.data.length} open PRs`);
+            
+            // Filter PRs by matching head branch
+            const matchingPrs = prs.data.filter(pr => {
+              const headRef = pr.head.ref;
+              console.log(`  PR #${pr.number}: head=${headRef}`);
+              return headRef === branch;
+            });
+            
+            if (matchingPrs.length > 0) {
+              const pr = matchingPrs[0];
+              console.log(`✓ Found PR #${pr.number} with matching branch`);
+              core.setOutput('pr_exists', 'true');
+              core.setOutput('pr_number', pr.number);
+            } else {
+              console.log(`✗ No open PR found for branch: ${branch}`);
+              core.setOutput('pr_exists', 'false');
+            }
 
       - name: Post Finish message in PR
-        if: ${{ steps.find-pull-request.outputs.number != '' }}
-        uses: actions/github-script@v7
+        if: ${{ steps.find-pr.outputs.pr_exists == 'true' }}
+        uses: actions/github-script@v8
         with:
          script: |
+           const prNumber = ${{steps.find-pr.outputs.pr_number}};
            const COMMENT_MARKER = '<!-- polarion-review -->';
            const body = COMMENT_MARKER + '\nPolarion vs Model comparison in current Branch\n${{steps.uploadSession.outputs.SfsFileNameLinks}}\n\n${{ steps.processSvgs.outputs.svgLinksMarkdown }}${{steps.pcsDiff.outputs.CommitID}}\n\nChanged Requirements:\n${{steps.diffreport.outputs.ModifiedRequirements}}';
-           const prNumber = ${{steps.find-pull-request.outputs.number}};
            const { data: comments } = await github.rest.issues.listComments({
              owner: context.repo.owner,
              repo: context.repo.repo,
@@ -247,7 +293,7 @@ jobs:
           Write-Output "${{steps.uploadSession.outputs.SfsFileNameLinks}}" >> $env:GITHUB_STEP_SUMMARY
            
       - name: Publish Model Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.0
         with:
           name: ModelFiles
           path: .\*.qeax
