Merge branch 'master' into mem_func

.github/workflows/build.yml

@@ -103,28 +103,27 @@ jobs:
 
         mode='${{matrix.mode}}'
         config_args='--compilers /compilers --max-errors 0 --verbose --version ${{matrix.version}}'
-        case "$mode" in
-          'link')
-            config_args="--map --require-protos $config_args"
-          ;;
-          'diff') ;;
-          *) exit 1 ;;
-        esac
-        echo "$config_args" | xargs python configure.py
+
+        function run_configure {
+          echo "$config_args" | xargs python configure.py
+        }
 
         case "$mode" in
           'link')
+            config_args="--map --require-protos $config_args"
+            run_configure
             ninja || ninja diff
           ;;
           'diff')
             root='build/${{matrix.version}}'
             expected="$root/expected-report.json"
-            actual="$root/report.json"
+            current="$root/report.json"
             changes="$root/changes-report.json"
-            head=$(git rev-parse HEAD)
+            head="$(git rev-parse HEAD)"
 
-            ninja all_source
-            objdiff-cli report generate -o "$actual"
+            function run_ninja {
+              ninja all_source "$current"
+            }
 
             case '${{github.event_name}}' in
               'pull_request')
@@ -137,11 +136,14 @@ jobs:
               *) exit 1 ;;
             esac
 
-            ninja all_source
-            objdiff-cli report generate -o "$expected"
+            run_configure
+            run_ninja
+            cp "$current" "$expected"
 
             git checkout "$head"
-            objdiff-cli report changes -o "$changes" "$expected" "$actual"
+            run_ninja
+
+            build/tools/objdiff-cli report changes -o "$changes" "$expected" "$current"
             python tools/diff_changes.py "$changes"
             status="$?"
             exit "$status"

.gitignore

@@ -39,6 +39,7 @@ build/
 *.map
 *.dol
 *.pdb
+/result
 
 # Temporary files
 *.swp

.nix/decomp-toolkit.nix

@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "decomp-toolkit";
-  version = "0.9.3";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "encounter";
     repo = "decomp-toolkit";
     rev = "v${version}";
-    hash = "sha256-5EWZwAQNso58WIWKtXNiDDBjMUYYArdRREtyD0bXurY=";
+    hash = "sha256-mgdohsZ0ZkTSg/UsGVBPmtlJFa1rKMG6aa4XG1S9F4Y=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoLock.lockFile = "${src}/Cargo.lock";
   cargoLock.outputHashes."ar-0.8.0" = "sha256-OLyo+cRRWMsI1i8NsgsBKRJH1XsKW1CculQnJ/wcya0=";
-  cargoLock.outputHashes."nod-1.2.0" = "sha256-M7jSBo1Dqrhy/F0osoUtTMNm2BkFnRy2MOmkTs1pvdM=";
   cargoLock.outputHashes."objdiff-core-2.0.0-alpha.3" = "sha256-E597zRlSpxrTGino7jqoQmyxWkLYXT1P6U2PRolm0Ek=";
   cargoLock.outputHashes."ppc750cl-0.3.0" = "sha256-nMJk+rgu7Ydi2VZfodJk0kBz9xLLVBVz0vEZPee8Q6M=";