add: code optimization

shqear93 · Apr 30, 2024 · 57ea3ad · 57ea3ad
1 parent 48e04c1
commit 57ea3ad
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -33746,19 +33746,11 @@ async function run() {
   try {
     const checkNames = core.getInput('check-names').split(', ');
     const { owner, repo } = github.context.repo;
-    let branch = null;
-
-    if (core.getInput('target-branch')) {
-      branch = core.getInput('target-branch');
-    } else if (github.context.payload.pull_request) {
-      branch = github.context.payload.pull_request.head.ref;
-    } else {
-      const repoInfo = await octokit.rest.repos.get({ owner, repo });
-      branch = repoInfo.data.default_branch; // default branch
-    }
-
     const token = core.getInput('github-token');
     const octokit = github.getOctokit(token);
+    const branch = await getBranchName(octokit, owner, repo);
+
+    core.info(`Branch: ${branch}`);
 
     const checksResult = await octokit.rest.checks.listForRef({ owner, repo, ref: branch });
 
@@ -33788,6 +33780,17 @@ async function run() {
   }
 }
 
+async function getBranchName(octokit, owner, repo) {
+  return core.getInput('target-branch') ||
+    github.context?.payload?.pull_request?.head?.ref ||
+    getDefaultBranch(octokit, owner, repo);
+}
+
+async function getDefaultBranch(octokit, owner, repo) {
+  const repoInfo = await octokit.rest.repos.get({ owner, repo });
+  return repoInfo.data.default_branch; // default branch
+}
+
 run();
 })();
 

diff --git a/src/index.js b/src/index.js
@@ -5,19 +5,11 @@ async function run() {
   try {
     const checkNames = core.getInput('check-names').split(', ');
     const { owner, repo } = github.context.repo;
-    let branch = null;
-
-    if (core.getInput('target-branch')) {
-      branch = core.getInput('target-branch');
-    } else if (github.context.payload.pull_request) {
-      branch = github.context.payload.pull_request.head.ref;
-    } else {
-      const repoInfo = await octokit.rest.repos.get({ owner, repo });
-      branch = repoInfo.data.default_branch; // default branch
-    }
-
     const token = core.getInput('github-token');
     const octokit = github.getOctokit(token);
+    const branch = await getBranchName(octokit, owner, repo);
+
+    core.info(`Branch: ${branch}`);
 
     const checksResult = await octokit.rest.checks.listForRef({ owner, repo, ref: branch });
 
@@ -47,4 +39,15 @@ async function run() {
   }
 }
 
+async function getBranchName(octokit, owner, repo) {
+  return core.getInput('target-branch') ||
+    github.context?.payload?.pull_request?.head?.ref ||
+    getDefaultBranch(octokit, owner, repo);
+}
+
+async function getDefaultBranch(octokit, owner, repo) {
+  const repoInfo = await octokit.rest.repos.get({ owner, repo });
+  return repoInfo.data.default_branch; // default branch
+}
+
 run();