Skip to content

Commit faff1df

Browse files
authored
Merge branch 'main' into jpnurmi/fix/updater-pr-ci
2 parents ff1ad68 + d81d746 commit faff1df

4 files changed

Lines changed: 10 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@
1111
### Fixes
1212

1313
- Updater - Trigger CI for new PRs without changelog updates ([#166](https://github.com/getsentry/github-workflows/pull/166))
14+
- Updater - Select the first branch when multiple branches point at `HEAD` ([#165](https://github.com/getsentry/github-workflows/pull/165))
15+
16+
### Dependencies
17+
18+
- Bump Danger JS from v13.0.4 to v13.0.5 ([#160](https://github.com/getsentry/github-workflows/pull/160))
19+
- [changelog](https://github.com/danger/danger-js/blob/main/CHANGELOG.md#1305)
20+
- [diff](https://github.com/danger/danger-js/compare/13.0.4...13.0.5)
1421

1522
## 3.3.0
1623

danger/danger.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=13.0.4
1+
version=13.0.5
22
repo=https://github.com/danger/danger-js

updater/scripts/update-dependency.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ if ("$Tag" -eq '') {
162162
if ("$headRef" -eq '') {
163163
throw "Couldn't determine repository head (no ref returned by ls-remote HEAD"
164164
}
165-
$mainBranch = (git ls-remote --heads $url | Where-Object { $_.StartsWith($headRef) }) -replace '.*\srefs/heads/', ''
165+
$mainBranch = (git ls-remote --heads $url | Where-Object { $_.StartsWith($headRef) } | Select-Object -First 1) -replace '.*\srefs/heads/', ''
166166
}
167167

168168
$url = $url -replace '\.git$', ''

updater/tests/update-dependency.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ switch ($action)
220220
$output | Should -Contain 'latestTag=0.28.0'
221221
$output | Should -Contain 'latestTagNice=v0.28.0'
222222
$output | Should -Contain 'url=https://github.com/getsentry/sentry-cli'
223-
$output | Should -Contain 'mainBranch=master'
223+
$output | Should -Contain 'mainBranch=main'
224224
}
225225
}
226226

0 commit comments

Comments
 (0)