From 25ac9d06dacd236ac758b7a3a47cd9afb81c4f29 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@me.com>
Date: Sat, 6 Nov 2021 19:58:12 +0000
Subject: [PATCH] Try to fix it

---
 ...bundle_analysis_upload.yml => analyze.yml} | 19 +++++++++--
 ...alysis_comment.yml => analyze_comment.yml} | 32 ++++++++++++-------
 2 files changed, 37 insertions(+), 14 deletions(-)
 rename .github/workflows/{bundle_analysis_upload.yml => analyze.yml} (88%)
 rename .github/workflows/{bundle_analysis_comment.yml => analyze_comment.yml} (64%)

diff --git a/.github/workflows/bundle_analysis_upload.yml b/.github/workflows/analyze.yml
similarity index 88%
rename from .github/workflows/bundle_analysis_upload.yml
rename to .github/workflows/analyze.yml
index e76f89ef5..1173a79ee 100644
--- a/.github/workflows/bundle_analysis_upload.yml
+++ b/.github/workflows/analyze.yml
@@ -1,5 +1,11 @@
-name: Bundle Analysis Upload
-on: pull_request
+name: Analyze Bundle
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main # change this if your default branch is named differently
+  workflow_dispatch:
 
 jobs:
   analyze:
@@ -77,5 +83,14 @@ jobs:
           name: analysis_comment.txt
           path: beta/.next/analyze/__bundle_analysis_comment.txt
 
+      - name: Save PR number
+        run: echo ${{ github.event.number }} > ./pr-number
+
+      - name: Upload PR number
+        uses: actions/upload-artifact@v2
+        with:
+          name: pr-number
+          path: ./pr-number
+
       # The actual commenting happens in the other action, matching the guidance in
       # https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
diff --git a/.github/workflows/bundle_analysis_comment.yml b/.github/workflows/analyze_comment.yml
similarity index 64%
rename from .github/workflows/bundle_analysis_comment.yml
rename to .github/workflows/analyze_comment.yml
index a83cb0e0b..b158960ae 100644
--- a/.github/workflows/bundle_analysis_comment.yml
+++ b/.github/workflows/analyze_comment.yml
@@ -1,13 +1,13 @@
-name: Bundle Analysis Comment
+name: Analyze Bundle (Comment)
 
 on:
   workflow_run:
-    workflows: ["Bundle Analysis Upload"]
+    workflows: ["Analyze Bundle"]
     types:
       - completed
 
 jobs:
-  comment:
+  upload:
     runs-on: ubuntu-latest
     if: >
       ${{ github.event.workflow_run.event == 'pull_request' &&
@@ -15,16 +15,23 @@ jobs:
     steps:
       - name: Download base branch bundle stats
         uses: dawidd6/action-download-artifact@v2
-        if: success() && github.event.number
         with:
-          workflow: bundle_analysis_upload.yml
+          workflow: analyze.yml
           name: analysis_comment.txt
           path: analysis_comment.txt
 
+      - name: Download PR number
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: analyze.yml
+          name: pr_number
+          path: pr_number
+
       - name: Get comment body
         id: get-comment-body
-        if: success() && github.event.number
+        if: success()
         run: |
+          pr_number=$(cat pr_number)
           body=$(cat analysis_comment.txt)
           body="## Size Changes
           <details>
@@ -36,28 +43,29 @@ jobs:
           body="${body//$'\n'/'%0A'}"
           body="${body//$'\r'/'%0D'}"
           echo ::set-output name=body::$body
+          echo ::set-output name=pr-number::$pr_number
         working-directory: beta
 
       - name: Find Comment
         uses: peter-evans/find-comment@v1
-        if: success() && github.event.number
+        if: success()
         id: fc
         with:
-          issue-number: ${{ github.event.number }}
+          issue-number: ${{ steps.get-comment-body.outputs.pr-number }}
           body-includes: "<!-- __NEXTJS_BUNDLE -->"
 
       - name: Create Comment
         uses: peter-evans/create-or-update-comment@v1.4.4
-        if: success() && github.event.number && steps.fc.outputs.comment-id == 0
+        if: success() && steps.fc.outputs.comment-id == 0
         with:
-          issue-number: ${{ github.event.number }}
+          issue-number: ${{ steps.get-comment-body.outputs.pr-number }}
           body: ${{ steps.get-comment-body.outputs.body }}
 
       - name: Update Comment
         uses: peter-evans/create-or-update-comment@v1.4.4
-        if: success() && github.event.number && steps.fc.outputs.comment-id != 0
+        if: success() && steps.fc.outputs.comment-id != 0
         with:
-          issue-number: ${{ github.event.number }}
+          issue-number: ${{ steps.get-comment-body.outputs.pr-number }}
           body: ${{ steps.get-comment-body.outputs.body }}
           comment-id: ${{ steps.fc.outputs.comment-id }}
           edit-mode: replace
\ No newline at end of file