improve PR check

b0t-at · Apr 22, 2024 · 1b5dae4 · 1b5dae4
1 parent 787dcf7
commit 1b5dae4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/Scripts/Update-Glarysoft.GlaryUtilities.ps1 b/Scripts/Update-Glarysoft.GlaryUtilities.ps1
@@ -40,7 +40,10 @@ if ($wingetVersions -contains $latestVersion) {
 }
 else {
     # Check for existing PRs
-    $ExistingPRs = gh pr list --search "$($wingetPackage) version $($latestVersion) in:title draft:false" --state 'all' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingOpenPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'open' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingMergedPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'merged' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+
+    $ExistingPRs = $ExistingOpenPRs += $ExistingMergedPRs
 
     # TODO Check if PR is already merged, if so exit
 

diff --git a/Scripts/Update-Logitech.OptionsPlus.ps1 b/Scripts/Update-Logitech.OptionsPlus.ps1
@@ -40,8 +40,10 @@ if ($wingetVersions -contains $latestVersion) {
 }
 else {
     # Check for existing PRs
-    $ExistingPRs = gh pr list --search "$($wingetPackage) version $($latestVersion) in:title draft:false" --state 'all' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingOpenPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'open' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingMergedPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'merged' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
 
+    $ExistingPRs = $ExistingOpenPRs += $ExistingMergedPRs
     # TODO Check if PR is already merged, if so exit
 
     # TODO if PR from us is already open, update PR with new version

diff --git a/Scripts/Update-Loupedeck.ps1 b/Scripts/Update-Loupedeck.ps1
@@ -45,8 +45,11 @@ if ($fullDownloadURLResponse.StatusCode -ne 200) {
     exit 1
 }
 
-# Check for existing PRs
-$ExistingPRs = gh pr list --search "$($wingetPackage) version $($versionInfo) in:title draft:false" --state 'all' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    # Check for existing PRs
+    $ExistingOpenPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'open' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingMergedPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'merged' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+
+    $ExistingPRs = $ExistingOpenPRs += $ExistingMergedPRs
 
 if ($wingetVersions -and ($wingetVersions -notmatch $versionInfo) -and ($ExistingPRs.Count -eq 0)) {
     $prMessage = "Update version: $wingetPackage version $versionInfo"

diff --git a/Scripts/Update-QFlipper.ps1 b/Scripts/Update-QFlipper.ps1
@@ -25,8 +25,11 @@ if ($wingetVersions -contains $latestVersionDirectory) {
 }
 else {
     # Check for existing PRs
-    $ExistingPRs = gh pr list --search "$($wingetPackage) version $($latestVersionDirectory) in:title draft:false" --state 'all' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingOpenPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'open' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingMergedPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'merged' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
 
+    $ExistingPRs = $ExistingOpenPRs += $ExistingMergedPRs
+
     if ($ExistingPRs.Count -gt 0) {
         Write-Output "$foundMessage"
         $ExistingPRs | ForEach-Object {

diff --git a/Scripts/Update-gitbutler.GitButler.ps1 b/Scripts/Update-gitbutler.GitButler.ps1
@@ -41,8 +41,11 @@ if ($wingetVersions -contains $latestVersion) {
 }
 else {
     # Check for existing PRs
-    $ExistingPRs = gh pr list --search "$($wingetPackage) version $($latestVersion) in:title draft:false" --state 'all' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingOpenPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'open' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
+    $ExistingMergedPRs = gh pr list --search "$($wingetPackage) $($latestVersion) in:title draft:false" --state 'merged' --json 'title,url' --repo 'microsoft/winget-pkgs' | ConvertFrom-Json
 
+    $ExistingPRs = $ExistingOpenPRs += $ExistingMergedPRs
+
     # TODO Check if PR is already merged, if so exit
 
     # TODO if PR from us is already open, update PR with new version