debug: check base and merge commit results (4)

Author: ffmcgee725

.github/workflows/benchmark-pr.yml

@@ -28,9 +28,7 @@ jobs:
       OWNER: ${{ github.repository_owner }}
       REPOSITORY: ${{ github.event.repository.name }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-      BASE_COMMIT_HASH: ${{ github.event.pull_request.base.sha }}
-      GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
-      MERGE_BASE_COMMIT_HASH: '' # placeholder so that we have autocomplete and logs
+      GITHUB_SHA: ${{ github.sha }}
 
     steps:
       - name: Checkout and setup environment
@@ -51,13 +49,6 @@ jobs:
       - name: Run page load benchmarks
         run: yarn test:e2e:benchmark
 
-      # - name: Get merge base commit hash
-      #   if: ${{ github.event_name == 'pull_request' }}
-      #   run: |
-      #     merge_base_commit_hash="$(git merge-base "${BASE_COMMIT_HASH}" "${GITHUB_SHA}")"
-      #     echo "MERGE_BASE_COMMIT_HASH=${merge_base_commit_hash}" >> "${GITHUB_ENV}"
-      #     echo "The merge base commit hash is '${merge_base_commit_hash}'"
-
       - name: Compare and comment
         if: ${{ github.event_name == 'pull_request' }}
         run: yarn tsx development/benchmark-pr-comment.ts

development/benchmark-pr-comment.ts

@@ -531,27 +531,14 @@ function generateBenchmarkComment(
  * @throws {Error} When GitHub API request fails or required environment variables are missing.
  */
 async function main(): Promise<void> {
-  const {
-    PR_COMMENT_TOKEN,
-    OWNER,
-    REPOSITORY,
-    PR_NUMBER,
-    GITHUB_SHA,
-    BASE_COMMIT_HASH,
-    MERGE_BASE_COMMIT_HASH,
-  } = process.env as Record<string, string>;
+  const { PR_COMMENT_TOKEN, OWNER, REPOSITORY, PR_NUMBER, GITHUB_SHA } =
+    process.env as Record<string, string>;
   const N_COMMITS = 10;
   const SHORT_SHA1 = GITHUB_SHA.slice(0, 7);
-  const SHORT_SHA_BASE = BASE_COMMIT_HASH.slice(0, 7);
-  const SHORT_SHA_MERGE = MERGE_BASE_COMMIT_HASH.slice(0, 7);
 
   console.log({
     GITHUB_SHA,
-    BASE_COMMIT_HASH,
-    MERGE_BASE_COMMIT_HASH,
     SHORT_SHA1,
-    SHORT_SHA_BASE,
-    SHORT_SHA_MERGE,
   });
 
   if (!PR_NUMBER) {
@@ -584,7 +571,7 @@ async function main(): Promise<void> {
     return;
   }
 
-  benchmarkData.commit = `${SHORT_SHA1}--${SHORT_SHA_BASE}--${SHORT_SHA_MERGE}`;
+  benchmarkData.commit = SHORT_SHA1;
   const referenceData = await fetchLatestMainBenchmarkData(N_COMMITS);
 
   const commentBody = generateBenchmarkComment(benchmarkData, referenceData);