Fix using cached compiled mods in deploy

ramensoftware · Dec 21, 2024 · 674dba5 · 674dba5
1 parent f5bc593
commit 674dba5
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/deploy.ts b/deploy.ts
@@ -174,9 +174,20 @@ function generateModData(modId: string, changelogPath: string, modDir: string) {
         const modVersionCompiled64FilePath = path.join(modDir, `${metadata.version}_64.dll`);
         const cachedMod32Path = findCachedMod(modId, metadata.version, '32');
         const cachedMod64Path = findCachedMod(modId, metadata.version, '64');
-        if (cachedMod32Path && cachedMod64Path) {
-            fs.copyFileSync(cachedMod32Path, modVersionCompiled32FilePath);
-            fs.copyFileSync(cachedMod64Path, modVersionCompiled64FilePath);
+        if (cachedMod32Path || cachedMod64Path) {
+            const modHas32 = metadata.architecture?.includes('x86') ?? true;
+            const modHas64 = metadata.architecture?.includes('x86-64') ?? true;
+            if (modHas32 != !!cachedMod32Path || modHas64 != !!cachedMod64Path) {
+                throw new Error(`Mod ${modId} architecture mismatch`);
+            }
+
+            if (cachedMod32Path) {
+                fs.copyFileSync(cachedMod32Path, modVersionCompiled32FilePath);
+            }
+
+            if (cachedMod64Path) {
+                fs.copyFileSync(cachedMod64Path, modVersionCompiled64FilePath);
+            }
         } else {
             compileMod(modVersionFilePath, modVersionCompiled32FilePath, modVersionCompiled64FilePath);
         }