Merge pull request #2 from sankichi92/fix-bug

Fix bug that `git diff` fails on pull_request events
sankichi92 · Jul 2, 2024 · bf3cad9 · bf3cad9
2 parents 20199f7 + 0313729
commit bf3cad9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/github.ts b/src/github.ts
@@ -1,11 +1,11 @@
 import type { Context } from "@actions/github/lib/context";
 import type { PullRequestEvent, PushEvent } from "@octokit/webhooks-types";
 
-export function getBaseRef(context: Context) {
+export function getBaseSHA(context: Context) {
   switch (context.eventName) {
     case "pull_request": {
       const payload = context.payload as PullRequestEvent;
-      return payload.pull_request.base.ref;
+      return payload.pull_request.base.sha;
     }
     case "push": {
       const payload = context.payload as PushEvent;

diff --git a/src/main.ts b/src/main.ts
@@ -4,7 +4,7 @@ import * as core from "@actions/core";
 import * as github from "@actions/github";
 
 import { gitDiffExists, gitFetch, gitLsFiles } from "./git";
-import { getBaseRef } from "./github";
+import { getBaseSHA } from "./github";
 
 export async function run() {
   try {
@@ -24,13 +24,13 @@ export async function run() {
     core.endGroup();
 
     core.startGroup("Fetching the base commit");
-    const baseRef = getBaseRef(github.context);
-    await gitFetch(baseRef);
+    const baseSHA = getBaseSHA(github.context);
+    await gitFetch(baseSHA);
     core.endGroup();
 
     core.startGroup("Comparing git diff");
     const isChanged = await Promise.all(
-      candidateDirs.map((dir) => gitDiffExists(baseRef, dir)),
+      candidateDirs.map((dir) => gitDiffExists(baseSHA, dir)),
     );
     const changedDirs = candidateDirs.filter((_, i) => isChanged[i]);
     core.endGroup();