@taole/deploy-helper 0.4.0 → 0.4.1

package/lib/pipelineApi.mjs

@@ -155,23 +155,35 @@ async function getPipelineInfoByName(name) {
  * @param {number} interval 轮询间隔时间
  * @returns 流水线执行详情
  */
-async function waitPipelineRunFinish(pipelineID, runId, interval = 3000) {
+async function waitPipelineRunFinish(pipelineID, runId, interval = 5000) {
     const pipelineRunDetailUrl = `https://flow.aliyun.com/pipelines/${pipelineID}/builds/${runId}`;
     log(`开始轮询至流水线执行完成`);
     let runDetail = await getPipelineRunFunc(organizationId, pipelineID, runId);
+    let passFailedCount = 0;
+    let passFailedMaxCount = 3;
     while (runDetail.status === "RUNNING" || runDetail.status === "WAITING") {
         const { stage, job } = getCurrentJob(runDetail);
         log(`流水线执行状态: ${runDetail.status}，阶段: ${stage.name}，任务: ${job.name}，等${interval / 1000}秒后重新轮询`);
         if (runDetail.status === "WAITING") {
             if (stage && job) {
                 log(`尝试自动通过人工卡点`);
-                const isPass = await passPipelineJob(pipelineID, runId, job.id);
-                if (isPass) {
-                    log(`人工卡点通过`);
-                } else {
-                    log(`人工卡点通过失败`);
-                    break;
+                try {
+                    const isPass = await passPipelineJob(pipelineID, runId, job.id);
+                    if (isPass) {
+                        log(`人工卡点通过`);
+                    } else {
+                        log(`人工卡点通过失败`);
+                        passFailedCount++;
+                    }
+                } catch (error) {
+                    passFailedCount++;
+                    log(`人工卡点通过失败`, error);
                 }
+                
+            }
+            if(passFailedCount >= passFailedMaxCount) {
+                log(`人工卡点通过失败次数超过最大值， 放弃`);
+                break;
             }
         }
         await new Promise(resolve => setTimeout(resolve, interval));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",