@rallycry/conveyor-agent 5.5.0 → 5.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2155,8 +2155,13 @@ function buildPackTools(connection) {
|
|
|
2155
2155
|
async ({ childTaskId }) => {
|
|
2156
2156
|
try {
|
|
2157
2157
|
const result = await connection.approveAndMergePR(childTaskId);
|
|
2158
|
+
if (result.merged) {
|
|
2159
|
+
return textResult(
|
|
2160
|
+
`PR #${result.prNumber} approved and merged for task ${result.childTaskId}. Task status updated to ReviewDev.`
|
|
2161
|
+
);
|
|
2162
|
+
}
|
|
2158
2163
|
return textResult(
|
|
2159
|
-
`PR #${result.prNumber}
|
|
2164
|
+
`PR #${result.prNumber} merge queued for task ${result.childTaskId} \u2014 CI checks still in progress. The PR will auto-merge when all checks pass. Do NOT proceed as if merged. Wait for the child task status to change to ReviewDev before continuing.`
|
|
2160
2165
|
);
|
|
2161
2166
|
} catch (error) {
|
|
2162
2167
|
return textResult(
|
|
@@ -4074,4 +4079,4 @@ export {
|
|
|
4074
4079
|
ProjectRunner,
|
|
4075
4080
|
FileCache
|
|
4076
4081
|
};
|
|
4077
|
-
//# sourceMappingURL=chunk-
|
|
4082
|
+
//# sourceMappingURL=chunk-LYXKPBQN.js.map
|