diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index 2a064c093..b42aa0433 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -6,6 +6,11 @@ on: workflow_dispatch: inputs: + cdn_branch: + type: string + required: false + default: main + description: What CDN branch to write to zip_url: type: string required: false @@ -14,10 +19,6 @@ on: type: string required: false description: Root dir of ZIP which houses the executable and Data dir - zip_branch: - type: string - required: false - description: What CDN branch must the ZIP be written to schedule: - cron: '0 2 * * *' @@ -41,14 +42,17 @@ jobs: run: bun install - name: Setup DepotDownloader + if: github.event.inputs.zip_url == '' run: bun scripts/setupDepotDownloader.ts - - name: Run DepotDownloader + - name: Download Steam client + if: github.event.inputs.zip_url == '' run: | chmod +x ./temp/depotDownloader/DepotDownloader ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" - name: Apply patches + if: github.event.inputs.zip_url == '' env: DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN: ${{ secrets.GH_TOKEN }} @@ -57,6 +61,17 @@ jobs: WOTB_DLC_CDN: ${{ secrets.WOTB_DLC_CDN }} run: bun scripts/applyPatches.ts --depot + - name: Download ZIP client + if: github.event.inputs.zip_url != '' + env: + ZIP_URL: ${{ github.event.inputs.zip_url }} + ZIP_ROOT: ${{ github.event.inputs.zip_root }} + run: | + curl -o client.zip $ZIP_URL + unzip client.zip + rm client.zip + mv $ZIP_ROOT depots/444202/0 + - name: Build assets env: DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }} @@ -65,4 +80,5 @@ jobs: DATABASE_URL: ${{ secrets.DATABASE_URL }} VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} + NEXT_PUBLIC_ASSET_BRANCH: ${{ github.event.inputs.cdn_branch }} run: bun build:assets --all-targets --depot --production diff --git a/scripts/buildAssets/constants.ts b/scripts/buildAssets/constants.ts index e66c10e87..ed62e8fce 100644 --- a/scripts/buildAssets/constants.ts +++ b/scripts/buildAssets/constants.ts @@ -3,11 +3,9 @@ import { argv } from 'process'; const isDepot = argv.includes('--depot'); -export const WOTB_WIN32_DEPOT = 444202; - export const DATA = isDepot ? await (async () => { - const [installationVersion] = await readdir(`depots/${WOTB_WIN32_DEPOT}`); - return `depots/${WOTB_WIN32_DEPOT}/${installationVersion}/Data`; + const [installationVersion] = await readdir(`depots/444202`); + return `depots/444202/${installationVersion}/Data`; })() : 'C:/Program Files (x86)/Steam/steamapps/common/World of Tanks Blitz/Data'; diff --git a/scripts/downloadZipClient.ts b/scripts/downloadZipClient.ts new file mode 100644 index 000000000..c3939cf3a --- /dev/null +++ b/scripts/downloadZipClient.ts @@ -0,0 +1,3 @@ +import { assertSecret } from '../src/core/blitzkit/secret'; + +assertSecret(process.env.ZIP_URL);