Commit 1ca8ac1
committed
Fix sync-dependencies infinite PR loop
The previous workflow tried fast-forward master into dependencies
and fell back to a deps-sync branch + PR on failure. Under squash
merges (used for both dependencies -> master and deps-sync ->
dependencies), the branches diverge permanently after the first
sync, so FF never succeeds and every push to master creates a
fresh deps-sync PR.
Open the PR with head=master directly and gate creation on a tree
diff against dependencies. When trees already match (typical after
a dependencies -> master merge) no PR is opened. This breaks the
loop and drops the deps-sync branch from the design.1 parent 3b07603 commit 1ca8ac1
2 files changed
Lines changed: 10 additions & 29 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | | - | |
| 6 | + | |
9 | 7 | | |
10 | 8 | | |
11 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
32 | 28 | | |
33 | 29 | | |
34 | 30 | | |
35 | 31 | | |
36 | | - | |
37 | 32 | | |
38 | 33 | | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
44 | 37 | | |
45 | 38 | | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
| 39 | + | |
57 | 40 | | |
58 | 41 | | |
59 | | - | |
| 42 | + | |
60 | 43 | | |
61 | | - | |
| 44 | + | |
62 | 45 | | |
63 | 46 | | |
64 | 47 | | |
0 commit comments