From ea0cede264d8f117c634806f6d5a3d18083d2667 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Fri, 13 May 2022 12:03:18 -0400
Subject: [PATCH] Update workflows to be more explicit in their steps so it's
 easier to see the progress and debug

---
 .github/workflows/VerifyBuild.yml | 24 ++++++++++++++++++++++-
 .github/workflows/VerifyPR.yml    | 32 ++++++++++++++++++++++++++-----
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/VerifyBuild.yml b/.github/workflows/VerifyBuild.yml
index c77e88a8..aefc4986 100644
--- a/.github/workflows/VerifyBuild.yml
+++ b/.github/workflows/VerifyBuild.yml
@@ -20,10 +20,32 @@ jobs:
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget libcapstone-dev
+        sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget libcapstone-dev binutils-mips-linux-gnu
         
     - name: Get ROM
       run: wget -q -O baseroms/dkr.z64 ${{secrets.ROMURL}}
+
+    - name: Verify ROM
+      run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/dkr.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+
+    - name: Build Recomp
+      run: |
+        cd tools/ido-static-recomp/
+        python3 build.py ido/5.3 -O2
+        cp build5.3/out/usr/bin/cc build5.3/out/cc
+        cp build5.3/out/usr/lib/* build5.3/out/
+        cd ../../
+
+    - name: Build Tools
+      run: |
+        cd tools
+        make
+        cd ..
+
+    - name: Extract Assets
+      run: |
+        ./extract.sh
+        python3 tools/python/check_if_need_to_extract.py us_1.0
       
     - name: Build ROM
       run: make
diff --git a/.github/workflows/VerifyPR.yml b/.github/workflows/VerifyPR.yml
index c9aab60f..60fccab8 100644
--- a/.github/workflows/VerifyPR.yml
+++ b/.github/workflows/VerifyPR.yml
@@ -16,17 +16,39 @@ jobs:
         submodules: recursive
         ref: ${{ github.event.pull_request.head.ref }}
         repository: ${{ github.event.pull_request.head.repo.full_name }}
-    
+
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget libcapstone-dev
-        
+        sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget libcapstone-dev binutils-mips-linux-gnu
+
     - name: Get ROM
       run: wget -q -O baseroms/dkr.z64 ${{secrets.ROMURL}}
-      
+
+    - name: Verify ROM
+      run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/dkr.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+
+    - name: Build Recomp
+      run: |
+        cd tools/ido-static-recomp/
+        python3 build.py ido/5.3 -O2
+        cp build5.3/out/usr/bin/cc build5.3/out/cc
+        cp build5.3/out/usr/lib/* build5.3/out/
+        cd ../../
+
+    - name: Build Tools
+      run: |
+        cd tools
+        make
+        cd ..
+
+    - name: Extract Assets
+      run: |
+        ./extract.sh
+        python3 tools/python/check_if_need_to_extract.py us_1.0
+
     - name: Build ROM
       run: make
-      
+
     - name: Verify Build
       run: if [[ $(sha1sum -c --quiet sha1/dkr.us_1.0.sha1) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi