From b222cbe41ce934637f722cff6dc7330bd064eb5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:51:11 -0600 Subject: [PATCH] feat: call build script --- .github/workflows/cd-assets.yml | 4 ++-- scripts/buildAssets/boosterIcons.ts | 3 ++- scripts/buildAssets/camouflageIcons.ts | 3 ++- scripts/buildAssets/circleFlags.ts | 3 ++- scripts/buildAssets/constants.ts | 3 --- scripts/buildAssets/consumableProvisionIcons.ts | 3 ++- scripts/buildAssets/definitions.ts | 3 ++- scripts/buildAssets/equipmentIcons.ts | 3 ++- scripts/buildAssets/index.ts | 9 +++++++++ scripts/buildAssets/moduleIcons.ts | 3 ++- scripts/buildAssets/scratchedFlags.ts | 3 ++- scripts/buildAssets/shellIcons.ts | 3 ++- scripts/buildAssets/tankArmors.ts | 3 ++- scripts/buildAssets/tankIcons.ts | 3 ++- scripts/buildAssets/tankModels.ts | 3 ++- 15 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index 9a9bff50e..47bcdee8f 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -37,5 +37,5 @@ jobs: - name: Run DepotDownloader run: ./temp/depotDownloader/DepotDownloader.exe -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" - - name: Snitch - run: cd depots; ls; cd 444200; ls + - name: Build assets + run: GH_TOKEN=${{ secrets.GITHUB_TOKEN }} yarn build:assets --all-targets --depot diff --git a/scripts/buildAssets/boosterIcons.ts b/scripts/buildAssets/boosterIcons.ts index 2b1069ba8..3c4196687 100644 --- a/scripts/buildAssets/boosterIcons.ts +++ b/scripts/buildAssets/boosterIcons.ts @@ -1,10 +1,11 @@ import { readdir } from 'fs/promises'; import sharp from 'sharp'; +import { DATA } from '.'; import { readDVPLFile } from '../../src/core/blitz/readDVPLFile'; import { readStringDVPL } from '../../src/core/blitz/readStringDVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; export async function boosterIcons(production: boolean) { const boosterFiles = (await readdir(`${DATA}/${POI.boosterIcons}`)).filter( diff --git a/scripts/buildAssets/camouflageIcons.ts b/scripts/buildAssets/camouflageIcons.ts index c9543456c..cde6c6b0c 100644 --- a/scripts/buildAssets/camouflageIcons.ts +++ b/scripts/buildAssets/camouflageIcons.ts @@ -1,7 +1,8 @@ +import { DATA } from '.'; import { readDVPLFile } from '../../src/core/blitz/readDVPLFile'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; export async function camouflageIcons(production: boolean) { console.log('Building camouflage icons...'); diff --git a/scripts/buildAssets/circleFlags.ts b/scripts/buildAssets/circleFlags.ts index d293f2bb7..720da1b02 100644 --- a/scripts/buildAssets/circleFlags.ts +++ b/scripts/buildAssets/circleFlags.ts @@ -1,8 +1,9 @@ import { readdir } from 'fs/promises'; +import { DATA } from '.'; import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; export async function circleFlags(production: boolean) { const flags = await readdir(`${DATA}/${POI.flags}`); diff --git a/scripts/buildAssets/constants.ts b/scripts/buildAssets/constants.ts index 503a7399c..9ddff759e 100644 --- a/scripts/buildAssets/constants.ts +++ b/scripts/buildAssets/constants.ts @@ -1,6 +1,3 @@ -export const DATA = - 'C:/Program Files (x86)/Steam/steamapps/common/World of Tanks Blitz/Data'; - export const POI = { vehicleDefinitions: 'XML/item_defs/vehicles', strings: 'Strings', diff --git a/scripts/buildAssets/consumableProvisionIcons.ts b/scripts/buildAssets/consumableProvisionIcons.ts index 9f1f2ca0a..ce78c5dc8 100644 --- a/scripts/buildAssets/consumableProvisionIcons.ts +++ b/scripts/buildAssets/consumableProvisionIcons.ts @@ -1,11 +1,12 @@ import sharp from 'sharp'; +import { DATA } from '.'; import { readDVPLFile } from '../../src/core/blitz/readDVPLFile'; import { readStringDVPL } from '../../src/core/blitz/readStringDVPL'; import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; import { ConsumablesCommon, ProvisionsCommon } from './definitions'; interface Mappings { diff --git a/scripts/buildAssets/definitions.ts b/scripts/buildAssets/definitions.ts index 0b87de030..7c9e247c5 100644 --- a/scripts/buildAssets/definitions.ts +++ b/scripts/buildAssets/definitions.ts @@ -2,6 +2,7 @@ import { readdir } from 'fs/promises'; import { parse as parsePath } from 'path'; import { Vector3Tuple } from 'three'; import { parse as parseYaml } from 'yaml'; +import { DATA } from '.'; import { TankType } from '../../src/components/Tanks'; import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL'; @@ -31,7 +32,7 @@ import { TankDefinitions, Tier, } from '../../src/core/blitzkrieg/tankDefinitions'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; import { TankParameters } from './tankIcons'; type BlitzTankType = 'AT-SPG' | 'lightTank' | 'mediumTank' | 'heavyTank'; diff --git a/scripts/buildAssets/equipmentIcons.ts b/scripts/buildAssets/equipmentIcons.ts index 31e178b8c..7334c2612 100644 --- a/scripts/buildAssets/equipmentIcons.ts +++ b/scripts/buildAssets/equipmentIcons.ts @@ -1,11 +1,12 @@ import sharp from 'sharp'; +import { DATA } from '.'; import { readDVPLFile } from '../../src/core/blitz/readDVPLFile'; import { readStringDVPL } from '../../src/core/blitz/readStringDVPL'; import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; import { OptionalDevices } from './definitions'; interface Mappings { diff --git a/scripts/buildAssets/index.ts b/scripts/buildAssets/index.ts index 6d2421499..69cd9d84b 100644 --- a/scripts/buildAssets/index.ts +++ b/scripts/buildAssets/index.ts @@ -1,4 +1,5 @@ import { config } from 'dotenv'; +import { readdir } from 'fs/promises'; import { argv } from 'process'; import { boosterIcons } from './boosterIcons'; import { camouflageIcons } from './camouflageIcons'; @@ -21,6 +22,14 @@ const targets = argv ?.split('=')[1] .split(','); const production = argv.includes('--production'); +const isDepot = argv.includes('--depot'); + +export const DATA = isDepot + ? await (async () => { + const [installationVersion] = await readdir('depots/444202'); + return `depots/444202/${installationVersion}/Data`; + })() + : 'C:/Program Files (x86)/Steam/steamapps/common/World of Tanks Blitz/Data'; if (!targets && !allTargets) throw new Error('No target(s) specified'); diff --git a/scripts/buildAssets/moduleIcons.ts b/scripts/buildAssets/moduleIcons.ts index 1866e9aa4..3f2e32606 100644 --- a/scripts/buildAssets/moduleIcons.ts +++ b/scripts/buildAssets/moduleIcons.ts @@ -1,8 +1,9 @@ import { readdir } from 'fs/promises'; +import { DATA } from '.'; import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; export async function moduleIcons(production: boolean) { console.log('Building module icons...'); diff --git a/scripts/buildAssets/scratchedFlags.ts b/scripts/buildAssets/scratchedFlags.ts index 8bde6509b..95b02c981 100644 --- a/scripts/buildAssets/scratchedFlags.ts +++ b/scripts/buildAssets/scratchedFlags.ts @@ -1,8 +1,9 @@ import { readdir } from 'fs/promises'; +import { DATA } from '.'; import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; export async function scratchedFlags(production: boolean) { console.log('Building scratched flags...'); diff --git a/scripts/buildAssets/shellIcons.ts b/scripts/buildAssets/shellIcons.ts index 350bfd72e..3d7c4ddb2 100644 --- a/scripts/buildAssets/shellIcons.ts +++ b/scripts/buildAssets/shellIcons.ts @@ -1,10 +1,11 @@ import { readdir } from 'fs/promises'; import sharp from 'sharp'; +import { DATA } from '.'; import { readDVPLFile } from '../../src/core/blitz/readDVPLFile'; import { readStringDVPL } from '../../src/core/blitz/readStringDVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; export async function shellIcons(production: boolean) { console.log('Building shell icons...'); diff --git a/scripts/buildAssets/tankArmors.ts b/scripts/buildAssets/tankArmors.ts index b23bbf1ae..53ea6d770 100644 --- a/scripts/buildAssets/tankArmors.ts +++ b/scripts/buildAssets/tankArmors.ts @@ -1,11 +1,12 @@ import { NodeIO } from '@gltf-transform/core'; import { readdir } from 'fs/promises'; +import { DATA } from '.'; import { extractArmor } from '../../src/core/blitz/extractArmor'; import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { toUniqueId } from '../../src/core/blitz/toUniqueId'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; import { VehicleDefinitionList } from './definitions'; export async function tankArmors(production: boolean) { diff --git a/scripts/buildAssets/tankIcons.ts b/scripts/buildAssets/tankIcons.ts index 2bef7b303..ccfa00fa2 100644 --- a/scripts/buildAssets/tankIcons.ts +++ b/scripts/buildAssets/tankIcons.ts @@ -1,12 +1,13 @@ import { readdir } from 'fs/promises'; import { Vector3Tuple } from 'three'; +import { DATA } from '.'; import { NATION_IDS } from '../../src/constants/nations'; import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL'; import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; import { VehicleDefinitionList } from './definitions'; export interface TankParameters { diff --git a/scripts/buildAssets/tankModels.ts b/scripts/buildAssets/tankModels.ts index 187468a3e..e03e0cd05 100644 --- a/scripts/buildAssets/tankModels.ts +++ b/scripts/buildAssets/tankModels.ts @@ -1,13 +1,14 @@ import { NodeIO } from '@gltf-transform/core'; import { readdir } from 'fs/promises'; import { Vector3Tuple } from 'three'; +import { DATA } from '.'; import { extractModel } from '../../src/core/blitz/extractModel'; import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL'; import { toUniqueId } from '../../src/core/blitz/toUniqueId'; import { commitAssets } from '../../src/core/blitzkrieg/commitAssets'; import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles'; -import { DATA, POI } from './constants'; +import { POI } from './constants'; import { VehicleDefinitionList } from './definitions'; import { TankParameters } from './tankIcons';