Fix annotations for pull requests

package.json

@@ -8,6 +8,7 @@
     "step:config": "scripts/run-step getConfigContents"
   },
   "devDependencies": {
+    "@octokit/webhooks-types": "^7.6.1",
     "@types/common-tags": "^1.8.1",
     "@types/node": "10.17.60",
     "@types/semver": "^7.5.6",

src/addAnnotations.ts

@@ -4,6 +4,7 @@ import { GitHub, getOctokitOptions } from '@actions/github/lib/utils';
 import { throttling } from '@octokit/plugin-throttling';
 import { Context } from '@actions/github/lib/context';
 import { Octokit } from '@octokit/rest';
+import type { PullRequestEvent } from '@octokit/webhooks-types';
 import { stripIndent as markdown } from 'common-tags';
 import { ThemeCheckReport, ThemeCheckOffense } from './types';
 import * as path from 'path';
@@ -79,7 +80,6 @@ export async function addAnnotations(
   const themeRoot = core.getInput('theme_root');
   const version = core.getInput('version');
   const flags = core.getInput('flags');
-
   const octokit = new ThrottledOctokit({
     ...getOctokitOptions(ghToken),
     throttle: {
@@ -113,28 +113,26 @@ export async function addAnnotations(
 
   console.log('Creating GitHub check...');
 
-  const root = path.resolve(cwd, themeRoot);
-
   const result: ThemeCheckReport[] = reports.filter(
     getDiffFilter(
-      root,
+      path.resolve(cwd, themeRoot),
       fileDiff?.map((x) => path.join(cwd, x)),
     ),
   );
 
   // Create check
+  const prPayload = github.context.payload as PullRequestEvent
   const check = await octokit.rest.checks.create({
-    owner: ctx.repo.owner,
-    repo: ctx.repo.repo,
+    ...ctx.repo,
     name: CHECK_NAME,
-    head_sha: ctx.sha,
+    head_sha: github.context.eventName == 'pull_request' ? prPayload.pull_request.head.sha : github.context.sha,
     status: 'in_progress',
   });
 
   const allAnnotations: GitHubAnnotation[] = result
-    .flatMap((report: ThemeCheckReport) =>
+    .flatMap((report) =>
       report.offenses.map((offense) => ({
-        path: path.relative(root, path.resolve(report.path)),
+        path: path.relative(cwd, path.resolve(report.path)),
         start_line: offense.start_row + 1,
         end_line: offense.end_row + 1,
         start_column:
@@ -181,8 +179,7 @@ export async function addAnnotations(
   await Promise.all(
     annotationsChunks.map(async (annotations) =>
       octokit.rest.checks.update({
-        owner: ctx.repo.owner,
-        repo: ctx.repo.repo,
+        ...ctx.repo,
         check_run_id: check.data.id,
         output: {
           title: CHECK_NAME,
@@ -195,11 +192,9 @@ export async function addAnnotations(
 
   // Add final report
   await octokit.rest.checks.update({
-    owner: ctx.repo.owner,
-    repo: ctx.repo.repo,
+    ...ctx.repo,
     check_run_id: check.data.id,
     name: CHECK_NAME,
-    status: 'completed',
     conclusion: exitCode > 0 ? 'failure' : 'success',
     output: {
       title: CHECK_NAME,

yarn.lock

@@ -179,6 +179,11 @@
   dependencies:
     "@octokit/openapi-types" "^12.11.0"
 
+"@octokit/webhooks-types@^7.6.1":
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/@octokit/webhooks-types/-/webhooks-types-7.6.1.tgz#bc96371057c2d54c982c9f8f642655b26cd588eb"
+  integrity sha512-S8u2cJzklBC0FgTwWVLaM8tMrDuDMVE4xiTK4EYXM9GntyvrdbSoxqDQa+Fh57CCNApyIpyeqPhhFEmHPfrXgw==
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
   resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"