Skip to content

Commit

Permalink
fix 2.
Browse files Browse the repository at this point in the history
  • Loading branch information
Utesgui authored Apr 23, 2024
1 parent 3022b17 commit ecc35a0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Scripts/Update-Glarysoft.GlaryUtilities.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ else {
$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

$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
Expand Down
3 changes: 2 additions & 1 deletion Scripts/Update-Logitech.OptionsPlus.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ else {
$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
$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
Expand Down
4 changes: 2 additions & 2 deletions Scripts/Update-Loupedeck.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ if ($fullDownloadURLResponse.StatusCode -ne 200) {
$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

$ExistingPRs = $ExistingOpenPRs,$ExistingMergedPRs
if ($wingetVersions -and ($wingetVersions -notmatch $versionInfo) -and ($ExistingPRs.Count -eq 0)) {
$prMessage = "Update version: $wingetPackage version $versionInfo"
#architecture workaround: https://github.com/microsoft/winget-create/blob/main/doc/update.md
Expand Down
4 changes: 2 additions & 2 deletions Scripts/Update-QFlipper.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ else {
$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

$ExistingPRs = $ExistingOpenPRs,$ExistingMergedPRs
if ($ExistingPRs.Count -gt 0) {
Write-Output "$foundMessage"
$ExistingPRs | ForEach-Object {
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Update-gitbutler.GitButler.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ else {
$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
$ExistingPRs = $ExistingOpenPRs,$ExistingMergedPRs

# TODO Check if PR is already merged, if so exit

Expand Down

0 comments on commit ecc35a0

Please sign in to comment.