From 3617e117928230cbdcf5f97afb5539faa8a9d7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sun, 21 Jan 2024 00:01:32 -0600
Subject: [PATCH] feat: commit concurrency

---
 scripts/buildAssets/circleFlags.ts     |  4 ++--
 scripts/buildAssets/consumableIcons.ts |  2 +-
 scripts/buildAssets/definitions.ts     |  2 +-
 scripts/buildAssets/equipmentIcons.ts  |  2 +-
 scripts/buildAssets/index.ts           | 19 +++++++++----------
 scripts/buildAssets/moduleIcons.ts     |  2 +-
 scripts/buildAssets/scratchedFlags.ts  |  2 +-
 scripts/buildAssets/shellIcons.ts      |  2 +-
 scripts/buildAssets/tankArmors.ts      |  2 +-
 scripts/buildAssets/tankIcons.ts       |  2 +-
 scripts/buildAssets/tankModels.ts      |  5 -----
 11 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/scripts/buildAssets/circleFlags.ts b/scripts/buildAssets/circleFlags.ts
index ec178692f..4b32bdeb6 100644
--- a/scripts/buildAssets/circleFlags.ts
+++ b/scripts/buildAssets/circleFlags.ts
@@ -4,7 +4,7 @@ import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
 import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
 import { DATA, POI } from './constants';
 
-export async function circleFlags(production: boolean) {
+export async function buildCircleFlags(production: boolean) {
   const flags = await readdir(`${DATA}/${POI.flags}`);
   const changes = await Promise.all(
     flags
@@ -25,5 +25,5 @@ export async function circleFlags(production: boolean) {
       }),
   );
 
-  commitAssets('circle flags', changes, production);
+  await commitAssets('circle flags', changes, production);
 }
diff --git a/scripts/buildAssets/consumableIcons.ts b/scripts/buildAssets/consumableIcons.ts
index f34966708..f65719abd 100644
--- a/scripts/buildAssets/consumableIcons.ts
+++ b/scripts/buildAssets/consumableIcons.ts
@@ -89,5 +89,5 @@ export async function buildConsumableIcons(production: boolean) {
     }),
   );
 
-  commitAssets('consumable icons', changes, production);
+  await commitAssets('consumable icons', changes, production);
 }
diff --git a/scripts/buildAssets/definitions.ts b/scripts/buildAssets/definitions.ts
index 647c7909d..0041d08c8 100644
--- a/scripts/buildAssets/definitions.ts
+++ b/scripts/buildAssets/definitions.ts
@@ -675,7 +675,7 @@ export async function buildDefinitions(production: boolean) {
     });
   });
 
-  commitAssets(
+  await commitAssets(
     'definitions',
     [
       {
diff --git a/scripts/buildAssets/equipmentIcons.ts b/scripts/buildAssets/equipmentIcons.ts
index 95abc438b..d0a92b1e7 100644
--- a/scripts/buildAssets/equipmentIcons.ts
+++ b/scripts/buildAssets/equipmentIcons.ts
@@ -88,5 +88,5 @@ export async function equipmentIcons(production: boolean) {
     ),
   );
 
-  commitAssets('equipment icons', changes, production);
+  await commitAssets('equipment icons', changes, production);
 }
diff --git a/scripts/buildAssets/index.ts b/scripts/buildAssets/index.ts
index eca0251b4..f2c139e17 100644
--- a/scripts/buildAssets/index.ts
+++ b/scripts/buildAssets/index.ts
@@ -1,6 +1,6 @@
 import { config } from 'dotenv';
 import { argv } from 'process';
-import { circleFlags } from './circleFlags';
+import { buildCircleFlags } from './circleFlags';
 import { buildConsumableIcons } from './consumableIcons';
 import { buildDefinitions } from './definitions';
 import { equipmentIcons } from './equipmentIcons';
@@ -26,38 +26,37 @@ if (allTargets || targets?.includes('tankModels')) {
   await buildTankModels(production);
 }
 
-// no need to await the rest... I have enough ram
 if (allTargets || targets?.includes('tankArmor')) {
-  buildTankArmors(production);
+  await buildTankArmors(production);
 }
 
 if (allTargets || targets?.includes('definitions')) {
-  buildDefinitions(production);
+  await buildDefinitions(production);
 }
 
 if (allTargets || targets?.includes('tankIcons')) {
-  buildTankIcons(production);
+  await buildTankIcons(production);
 }
 
 if (allTargets || targets?.includes('scratchedFlags')) {
-  buildScratchedFlags(production);
+  await buildScratchedFlags(production);
 }
 
 if (allTargets || targets?.includes('circleFlags')) {
-  circleFlags(production);
+  await buildCircleFlags(production);
 }
 
 if (allTargets || targets?.includes('shellIcons')) {
-  buildShellIcons(production);
+  await buildShellIcons(production);
 }
 
 if (allTargets || targets?.includes('moduleIcons')) {
-  buildModuleIcons(production);
+  await buildModuleIcons(production);
 }
 if (allTargets || targets?.includes('equipmentIcons')) {
   equipmentIcons(production);
 }
 
 if (allTargets || targets?.includes('consumableIcons')) {
-  buildConsumableIcons(production);
+  await buildConsumableIcons(production);
 }
diff --git a/scripts/buildAssets/moduleIcons.ts b/scripts/buildAssets/moduleIcons.ts
index 10addb90a..14a3feabf 100644
--- a/scripts/buildAssets/moduleIcons.ts
+++ b/scripts/buildAssets/moduleIcons.ts
@@ -28,5 +28,5 @@ export async function buildModuleIcons(production: boolean) {
       }),
   );
 
-  commitAssets('module icons', changes, production);
+  await commitAssets('module icons', changes, production);
 }
diff --git a/scripts/buildAssets/scratchedFlags.ts b/scripts/buildAssets/scratchedFlags.ts
index 7f5497676..a12beaabe 100644
--- a/scripts/buildAssets/scratchedFlags.ts
+++ b/scripts/buildAssets/scratchedFlags.ts
@@ -27,5 +27,5 @@ export async function buildScratchedFlags(production: boolean) {
       }),
   );
 
-  commitAssets('scratched flags', changes, production);
+  await commitAssets('scratched flags', changes, production);
 }
diff --git a/scripts/buildAssets/shellIcons.ts b/scripts/buildAssets/shellIcons.ts
index 826b0c858..e449ede11 100644
--- a/scripts/buildAssets/shellIcons.ts
+++ b/scripts/buildAssets/shellIcons.ts
@@ -45,5 +45,5 @@ export async function buildShellIcons(production: boolean) {
       }),
   );
 
-  commitAssets('shell icons', changes, production);
+  await commitAssets('shell icons', changes, production);
 }
diff --git a/scripts/buildAssets/tankArmors.ts b/scripts/buildAssets/tankArmors.ts
index 75a7e99ef..44d3dd7fb 100644
--- a/scripts/buildAssets/tankArmors.ts
+++ b/scripts/buildAssets/tankArmors.ts
@@ -45,5 +45,5 @@ export async function buildTankArmors(production: boolean) {
     }),
   );
 
-  commitAssets('tank armor', changes, production);
+  await commitAssets('tank armor', changes, production);
 }
diff --git a/scripts/buildAssets/tankIcons.ts b/scripts/buildAssets/tankIcons.ts
index 6f473a73d..fe28c27aa 100644
--- a/scripts/buildAssets/tankIcons.ts
+++ b/scripts/buildAssets/tankIcons.ts
@@ -65,5 +65,5 @@ export async function buildTankIcons(production: boolean) {
     }),
   );
 
-  commitAssets('tank icons', changes, production);
+  await commitAssets('tank icons', changes, production);
 }
diff --git a/scripts/buildAssets/tankModels.ts b/scripts/buildAssets/tankModels.ts
index e32307d9f..b6309a8cd 100644
--- a/scripts/buildAssets/tankModels.ts
+++ b/scripts/buildAssets/tankModels.ts
@@ -26,11 +26,6 @@ export async function buildTankModels(production: boolean) {
   for (const nationIndex in nations) {
     const changes: FileChange[] = [];
     const nation = nations[nationIndex];
-
-    if (['china', 'european', 'france', 'germany', 'japan'].includes(nation)) {
-      continue;
-    }
-
     const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
       `${DATA}/${POI.vehicleDefinitions}/${nation}/list.xml.dvpl`,
     );