Merge branch 'main' into jpnurmi/fix/updater-pr-ci

vaind · web-flow · commit 8fc3a0e9876f · 2026-05-11T11:32:47.000+02:00
diff --git a/updater/tests/update-dependency.Tests.ps1 b/updater/tests/update-dependency.Tests.ps1
@@ -220,7 +220,9 @@ switch ($action)
                 $output | Should -Contain 'latestTag=0.28.0'
                 $output | Should -Contain 'latestTagNice=v0.28.0'
                 $output | Should -Contain 'url=https://github.com/getsentry/sentry-cli'
-                $output | Should -Contain 'mainBranch=main'
+                # sentry-cli has both `main` and `master`; which one is reported depends on
+                # which currently points at HEAD upstream, so accept either.
+                ($output | Where-Object { $_ -like 'mainBranch=*' }) | Should -BeIn @('mainBranch=main', 'mainBranch=master')
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,9 @@ switch ($action)`
`220`	`220`	`$output \| Should -Contain 'latestTag=0.28.0'`
`221`	`221`	`$output \| Should -Contain 'latestTagNice=v0.28.0'`
`222`	`222`	`$output \| Should -Contain 'url=https://github.com/getsentry/sentry-cli'`
`223`		`- $output \| Should -Contain 'mainBranch=main'`
	`223`	+ # sentry-cli has both `main` and `master`; which one is reported depends on
	`224`	`+ # which currently points at HEAD upstream, so accept either.`
	`225`	`+ ($output \| Where-Object { $_ -like 'mainBranch=*' }) \| Should -BeIn @('mainBranch=main', 'mainBranch=master')`
`224`	`226`	`}`
`225`	`227`	`}`
`226`	`228`