ci: fix error

MoegirlPediaInterfaceAdmins · May 17, 2023 · 521b132 · 521b132
1 parent 2415630
commit 521b132
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/scripts/ci/after.js b/scripts/ci/after.js
@@ -1,7 +1,7 @@
 import console, { originalConsole } from "../modules/console.js";
 originalConsole.info("=".repeat(120));
 console.info("Initialization done.");
-import { git } from "../modules/git.js";
+import git from "../modules/git.js";
 
 const packageLockFile = "package-lock.json";
 console.info("Start to recover", packageLockFile);

diff --git a/scripts/emailmapChecker/index.js b/scripts/emailmapChecker/index.js
@@ -1,7 +1,7 @@
 import console from "../modules/console.js";
 console.info("Initialization done.");
 import mailmap from "../modules/mailmap.js";
-import { git } from "../modules/git.js";
+import git from "../modules/git.js";
 import { startGroup, endGroup } from "@actions/core";
 import { isInGithubActions } from "../modules/octokit.js";
 

diff --git a/scripts/fireWebhook/index.js b/scripts/fireWebhook/index.js
@@ -3,6 +3,7 @@ import { startGroup, endGroup } from "@actions/core";
 import { isInMasterBranch, isInGithubActions, workflowLink } from "../modules/octokit.js";
 import jsonModule from "../modules/jsonModule.js";
 import generateHMACSignature from "../modules/generateHMACSignature.js";
+import git from "../modules/git.js";
 if (!isInGithubActions) {
     console.info("Not running in github actions, exit.");
     process.exit(0);
@@ -39,15 +40,19 @@ for (const [job, { result }] of Object.entries(NEEDS)) {
 if (data.success) {
     try {
         const GITHUB_EVENT = await jsonModule.readFile(process.env.GITHUB_EVENT_PATH);
-        startGroup("GITHUB_EVENT");
-        console.info(JSON.stringify(GITHUB_EVENT, null, 4));
-        endGroup();
-        data.headCommitId = GITHUB_EVENT?.head_commit?.id;
-        data.headCommitMessage = GITHUB_EVENT?.head_commit?.message;
+        const head_commit = Reflect.has(GITHUB_EVENT, "head_commit") ? GITHUB_EVENT.head_commit : (await git.log({
+            format: {
+                id: "%H",
+                message: "%B",
+            },
+            maxCount: 1,
+        })).latest;
+        data.headCommitId = head_commit.id;
+        data.headCommitMessage = head_commit.message;
     } catch { }
 }
+console.info("Data:", data);
 const body = Buffer.from(JSON.stringify(data), "utf-8");
-console.info("body:", body.toString("base64"));
 for (let retryTime = 0; retryTime < 10; retryTime++) {
     try {
         const result = await (await fetch("https://echo.zuplo.io/", {

diff --git a/scripts/ganerateCommitsHistory/index.js b/scripts/ganerateCommitsHistory/index.js
@@ -13,7 +13,7 @@ import console from "../modules/console.js";
 import mailmap from "../modules/mailmap.js";
 import { startGroup, endGroup, exportVariable } from "@actions/core";
 import { isInMasterBranch } from "../modules/octokit.js";
-import { git } from "../modules/git.js";
+import git from "../modules/git.js";
 import { writeFile } from "../modules/jsonModule.js";
 import createCommit from "../modules/createCommit.js";
 

diff --git a/scripts/modules/createCommit.js b/scripts/modules/createCommit.js
@@ -1,5 +1,5 @@
 import console from "../modules/console.js";
-import { git } from "../modules/git.js";
+import git from "../modules/git.js";
 import { exportVariable } from "@actions/core";
 import { isInGithubActions, isPullRequest } from "../modules/octokit.js";
 

diff --git a/scripts/modules/git.js b/scripts/modules/git.js
@@ -1,7 +1,4 @@
-import console from "../modules/console.js";
 import { simpleGit } from "simple-git";
-import { error } from "@actions/core";
 
 export const git = simpleGit({ baseDir: process.cwd() });
-export const log = (err, data) => (err ? error : console.info)(data);
-export default { git, log };
+export default git;
diff --git a/scripts/postCommit/prepareGit.js b/scripts/postCommit/prepareGit.js
@@ -1,7 +1,7 @@
 import console from "../modules/console.js";
 console.info("Initialization done.");
 import { isInGithubActions } from "../modules/octokit.js";
-import { git } from "../modules/git.js";
+import git from "../modules/git.js";
 
 if (!isInGithubActions) {
     console.info("Not running in github actions, exit.");

diff --git a/scripts/postCommit/push.js b/scripts/postCommit/push.js
@@ -1,7 +1,7 @@
 import console from "../modules/console.js";
 console.info("Initialization done.");
 import { startGroup, endGroup, setOutput } from "@actions/core";
-import { git } from "../modules/git.js";
+import git from "../modules/git.js";
 import { isInGithubActions, isPullRequest } from "../modules/octokit.js";
 import jsonModule from "../modules/jsonModule.js";