@taole/deploy-helper 0.5.2 → 0.5.4

package/index.mjs

@@ -56,6 +56,14 @@ async function initConfigJson() {
     },
     "testSync": {
         "dist/index.html": "events/CHANGE_ME.htm"
+    },
+    "prodPipeline":{
+        "pipelines": [
+            {
+                "name": "OfficialSite OR SOMEOTHER",
+                "waitResult": true
+            }
+        ]
     }
 }`;
     fs.writeFileSync(configJsonPath, content, { encoding: "utf-8" });
@@ -73,14 +81,15 @@ async function getScpClient() {
     const scpClientConfig = {
         host: TEST_SERVER_HOST,
         username: 'root',
-        tryKeyboard: true,
-    }
-    const sshKeyPath = join(homedir(), ".ssh/id_rsa");
-    if (fs.existsSync(sshKeyPath)) {
-        scpClientConfig.privateKey = fs.readFileSync(sshKeyPath, "utf-8");
-    } else {
-        log(`${sshKeyPath}不存在, 建议配置本机ssh免密登录, 参考地址：https://foochane.cn/article/2019061601.html`);
+        tryKeyboard: false,
+        password: 'tuwan123!@#',
     }
+    // const sshKeyPath = join(homedir(), ".ssh/id_rsa");
+    // if (fs.existsSync(sshKeyPath)) {
+    //     scpClientConfig.privateKey = fs.readFileSync(sshKeyPath, "utf-8");
+    // } else {
+    //     log(`${sshKeyPath}不存在, 建议配置本机ssh免密登录, 参考地址：https://foochane.cn/article/2019061601.html`);
+    // }
     scpClient = await Client(scpClientConfig);
     return scpClient;
 }

package/lib/pipelineApi.mjs

@@ -166,18 +166,21 @@ async function waitPipelineRunFinish(pipelineID, runId, interval = 5000) {
         log(`流水线执行状态: ${runDetail.status}，阶段: ${stage.name}，任务: ${job.name}，${interval / 1000}秒后再次查询`);
         if (runDetail.status === "WAITING") {
             if (stage && job) {
-                log(`尝试自动通过人工卡点`);
-                try {
-                    const isPass = await passPipelineJob(pipelineID, runId, job.id);
-                    if (isPass) {
-                        log(`人工卡点通过`);
-                    } else {
-                        log(`人工卡点通过失败`);
+                const PassPipelineValidate = (job.actions || []).find(action => action.type === "PassPipelineValidate");
+                if (PassPipelineValidate) {
+                    log(`尝试自动通过人工卡点`);
+                    try {
+                        const isPass = await passPipelineJob(pipelineID, runId, job.id);
+                        if (isPass) {
+                            log(`人工卡点通过`);
+                        } else {
+                            log(`人工卡点通过失败`);
+                            passFailedCount++;
+                        }
+                    } catch (error) {
                         passFailedCount++;
+                        log(`人工卡点通过失败`, error);
                     }
-                } catch (error) {
-                    passFailedCount++;
-                    log(`人工卡点通过失败`, error);
                 }
             }
             if (passFailedCount >= passFailedMaxCount) {
@@ -202,7 +205,7 @@ async function waitPipelineRunFinish(pipelineID, runId, interval = 5000) {
  * @param {*} targetBranch 指定分支， 如果为空，则不指定分支
  * @returns 流水线信息和源码仓库信息, 触发流水线参数
  */
-async function getPipelineInfoDetail(pipelineName, targetBranch = ""){
+async function getPipelineInfoDetail(pipelineName, targetBranch = "") {
     let pipelineID = "";
     let pipelineInfo = null;
     let repoInfo = null;

package/package.json

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