Repository navigation
Commit a34cf2e
fix(core): identify the test merge from the merge ref, not the payload (#372)
getTestMergeBaseCommitSha() recognised GitHub's test-merge commit by
comparing its second parent against pull_request.head.sha. That value can
lag behind the merge ref the runner checked out: GitHub recomputes
refs/pull/<n>/merge when either branch moves, without always firing a new
event. When a push lands in between, the payload still carries the previous
head while the checkout is the newer test-merge commit.
The guard then rejected a genuine test-merge build and fell back to the
merge base, baselining the pull request against its fork point and
reporting every change merged into the base branch since as its own.
GITHUB_REF is set by the runner from the ref the run was triggered on, so on
a pull_request event it names the merge ref and cannot go stale. Together
with the existing check that the build runs on GITHUB_SHA it identifies the
test merge without the payload; the head.sha comparison stays as the
fallback when the merge ref is absent.
The parents.length check is split out so a non-merge HEAD is rejected before
either identification path runs.
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>1 parent 12a8c62 commit a34cf2e
2 files changed
Lines changed: 73 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
140 | 187 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
351 | 351 | | |
352 | 352 | | |
353 | 353 | | |
354 | | - | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
355 | 378 | | |
356 | 379 | | |
357 | 380 | | |
| |||
0 commit comments