Commit 81c3b37
authored
[CI] Fix Main2Main fresh-mode upstream reference (vllm-project#12988)
### What this PR does / why we need it?
Fix a Main2Main regression introduced by:
- vllm-project#12279
PR moved `upstream` setup into the incremental-only `FIXED_BASE_SHA`
condition. When a baseline rebase conflicts, the workflow falls back to
fresh mode with an empty `FIXED_BASE_SHA`, so `upstream/main` is not
created:
https://github.com/vllm-project/vllm-ascend/actions/runs/30284552529/job/90040429009.
`main2main_flow` then fails during initialization:
```text
fatal: Not a valid object name upstream/main
```
This change:
- derives the fixed upstream base from `base_sha` or `source_ref`;
- configures `upstream` in both fresh and incremental modes;
- pins `upstream/main` to the resolved SHA instead of fetching a moving
main;
- preserves the existing incremental rebase behavior.
### Does this PR introduce _any_ user-facing change?
### How was this patch tested?
- vLLM version: v0.25.1
- vLLM main:
vllm-project/vllm@fe784ff
---------
Signed-off-by: MrZ20 <2609716663@qq.com>1 parent 60cba93 commit 81c3b37
1 file changed
Lines changed: 20 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| 84 | + | |
| 85 | + | |
84 | 86 | | |
85 | 87 | | |
86 | 88 | | |
| |||
101 | 103 | | |
102 | 104 | | |
103 | 105 | | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
104 | 109 | | |
105 | 110 | | |
106 | 111 | | |
| |||
329 | 334 | | |
330 | 335 | | |
331 | 336 | | |
332 | | - | |
333 | | - | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
334 | 342 | | |
335 | 343 | | |
336 | 344 | | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
337 | 348 | | |
338 | | - | |
339 | | - | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
344 | 352 | | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
345 | 357 | | |
346 | 358 | | |
347 | 359 | | |
| |||
0 commit comments