fix: remove commit pending. (#3)

Co-authored-by: 元凛 <[email protected]>
actions-cool · Aug 30, 2022 · 89b7b22 · 89b7b22
1 parent 04242aa
commit 89b7b22
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.4.1
+
+`2022.08.30`
+
+- fix: remove commit pending.
+
 ## v1.4.0
 
 `2021.10.19`

diff --git a/dist/index.js b/dist/index.js
@@ -9804,10 +9804,7 @@ async function run() {
         let number = filterPRs[i];
         const result = await getPRStatus(owner, repo, number);
         if (result.ifCICompleted) {
-          if (
-            (result.commitState === 'success' || result.commitState === 'pending') &&
-            !result.ifCIHasFailure
-          ) {
+          if (result.commitState === 'success' && !result.ifCIHasFailure) {
             const onePR = await getOnePR(owner, repo, number);
             if (onePR.mergeable_state === 'dirty') {
               await doPRReview(owner, repo, number, 'REQUEST_CHANGES', conflictReviewBody);
@@ -9930,18 +9927,18 @@ async function getPRStatus(owner, repo, number) {
       if (!dealStringToArr(skipRunNames).includes(it.name)) {
         ifCICompleted = false;
       }
-      core.info(`[checkPRstatus][number: ${number}][inPorgress: ${it.name}]`);
+      core.info(`[checkPRstatus] [number: ${number}] [inPorgress: ${it.name}]`);
     }
     if (it.conclusion === 'failure') {
       if (!dealStringToArr(skipRunNames).includes(it.name)) {
         ifCIHasFailure = true;
       }
-      core.info(`[checkPRstatus][number: ${number}][hasFailure: ${it.name}]`);
+      core.info(`[checkPRstatus] [number: ${number}] [hasFailure: ${it.name}]`);
     }
   });
 
   core.info(
-    `[getPRStatus][number: ${number}/${runs.length}][commit: ${commit}][commitState: ${commitState}][ifCICompleted: ${ifCICompleted}][ifCIHasFailure: ${ifCIHasFailure}]`,
+    `[getPRStatus] [number: ${number}] [CI: ${runs.length}] [commit: ${commit}]\n\n[commitState: ${commitState}] [ifCICompleted: ${ifCICompleted}] [ifCIHasFailure: ${ifCIHasFailure}]`,
   );
 
   return {

diff --git a/src/main.js b/src/main.js
@@ -100,10 +100,7 @@ async function run() {
         let number = filterPRs[i];
         const result = await getPRStatus(owner, repo, number);
         if (result.ifCICompleted) {
-          if (
-            (result.commitState === 'success' || result.commitState === 'pending') &&
-            !result.ifCIHasFailure
-          ) {
+          if (result.commitState === 'success' && !result.ifCIHasFailure) {
             const onePR = await getOnePR(owner, repo, number);
             if (onePR.mergeable_state === 'dirty') {
               await doPRReview(owner, repo, number, 'REQUEST_CHANGES', conflictReviewBody);

diff --git a/src/octokit.js b/src/octokit.js
@@ -81,18 +81,18 @@ async function getPRStatus(owner, repo, number) {
       if (!dealStringToArr(skipRunNames).includes(it.name)) {
         ifCICompleted = false;
       }
-      core.info(`[checkPRstatus][number: ${number}][inPorgress: ${it.name}]`);
+      core.info(`[checkPRstatus] [number: ${number}] [inPorgress: ${it.name}]`);
     }
     if (it.conclusion === 'failure') {
       if (!dealStringToArr(skipRunNames).includes(it.name)) {
         ifCIHasFailure = true;
       }
-      core.info(`[checkPRstatus][number: ${number}][hasFailure: ${it.name}]`);
+      core.info(`[checkPRstatus] [number: ${number}] [hasFailure: ${it.name}]`);
     }
   });
 
   core.info(
-    `[getPRStatus][number: ${number}/${runs.length}][commit: ${commit}][commitState: ${commitState}][ifCICompleted: ${ifCICompleted}][ifCIHasFailure: ${ifCIHasFailure}]`,
+    `[getPRStatus] [number: ${number}] [CI: ${runs.length}] [commit: ${commit}]\n\n[commitState: ${commitState}] [ifCICompleted: ${ifCICompleted}] [ifCIHasFailure: ${ifCIHasFailure}]`,
   );
 
   return {