diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a509232d0..4875ab07f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -143,11 +143,21 @@ jobs:
       - name: Prepare
         run: cp -R /orig .
 
+      # Checkout the commit to generate OK bot report used for website build
+      - name: Checkout previous report repo state
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          git checkout HEAD^
+
+      # Checkout the commit to generate CI progress report for PR comment report
+      - name: Checkout previous report repo state
+        if: ${{ github.event_name == 'pull_request_target' }}
+        run: |
+          git checkout main
+
       # Generate report for previous repo state
       - name: Generate previous report
-        continue-on-error: true
         run: |
-          git checkout main
           python configure.py --version ${{ matrix.version }} \
                 --binutils /binutils --compilers /compilers
           ninja build/${{ matrix.version }}/report.json