Repository navigation
Commit 655034a
committed
fix(git-merge-pr): treat merge errors as transient when wait=true
When git-merge-pr is configured with wait:true and the merge API returns
an error (e.g. 405 "Required status check is expected"), the step returns
Running status instead of Failed+TerminalError so it retries on the next
reconciliation.
Previously, any error from MergePullRequest was treated as terminal, even
when wait was enabled. This caused promotions to fail permanently on the
first attempt when CI status checks were still pending.
Fixes #6397
Signed-off-by: Arunesh Dwivedi <[email protected]>1 parent e68672c commit 655034a
2 files changed
Lines changed: 27 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
130 | | - | |
131 | | - | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
132 | 136 | | |
133 | 137 | | |
134 | 138 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
| 116 | + | |
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
| |||
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
136 | 156 | | |
137 | 157 | | |
138 | 158 | | |
| |||
0 commit comments