From aeed328c187740daa604ba586e6cbe551c185cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Thu, 22 Aug 2024 19:09:05 -0500 Subject: [PATCH 1/9] Update credits.md --- docs/about/credits.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/about/credits.md b/docs/about/credits.md index a87b5d11a..801f272d8 100644 --- a/docs/about/credits.md +++ b/docs/about/credits.md @@ -12,7 +12,7 @@ BlitzKit is a one man band **TrèsAbhi** but I am far from solo. | Game file layout | Aeson | | 3-caliber rule edge cases | Minitelrose, ChickenMan7777 | | Embed UX | \_34, HisRoyalFatness, Synx | -| Tankopedia pre-release testing | [OPTML], Aeson, \_34, Droodles | -| Website advertisement platform | Aeson, Droodles | -| Compare pre-release testing | [OPTML], Droodles | +| Tankopedia pre-release testing | [OPTML], Aeson, \_34 | +| Website advertisement platform | Aeson | +| Compare pre-release testing | [OPTML] | | Redacted | GonnaHetzMe | From 912f134eb6c3869d02959ba4971fef6299b1af9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Thu, 22 Aug 2024 19:44:52 -0500 Subject: [PATCH 2/9] Update settings.json --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1ee34dfd5..784528977 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -55,7 +55,6 @@ "DIDS", "donotremove", "drei", - "Droodles", "dvpd", "dvpl", "DVPLCRC", From 5dc55914ed25c291850490eebc9569cfd4120b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:50:48 -0500 Subject: [PATCH 3/9] feat: linux assets --- .github/workflows/cd-assets.yml | 4 ++-- scripts/setupDepotDownloader.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index d6bd41a6d..644f89645 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -13,7 +13,7 @@ concurrency: jobs: build: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -29,7 +29,7 @@ jobs: run: bun scripts/setupDepotDownloader.ts - name: Run DepotDownloader - run: ./temp/depotDownloader/DepotDownloader.exe -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" + run: ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" - name: Apply patches run: | diff --git a/scripts/setupDepotDownloader.ts b/scripts/setupDepotDownloader.ts index 37aa6858c..01ead4510 100644 --- a/scripts/setupDepotDownloader.ts +++ b/scripts/setupDepotDownloader.ts @@ -18,13 +18,13 @@ await fetch( }>, ) .then(({ assets }) => { - const asset = assets.find(({ name }) => name.includes('windows-x64')); + const asset = assets.find(({ name }) => name.includes('linux-x64')); if (!asset) throw new Error('No asset found'); return fetch(asset.browser_download_url); }) .then((response) => response.arrayBuffer()) .then((arrayBuffer) => - writeFile('temp/depotDownloader.zip', Buffer.from(arrayBuffer)), + writeFile('temp/depotDownloader.zip', new Uint8Array(arrayBuffer)), ); console.log('Unzipping...'); From 59d837bbb2d0831683636b3ffd0e3ea32aa30540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:52:17 -0500 Subject: [PATCH 4/9] fix: format --- .github/workflows/cd-assets.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index 644f89645..cb917f63a 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -32,20 +32,8 @@ jobs: run: ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" - name: Apply patches - run: | - $env:DISCORD_CLIENT_ID = "${{ secrets.DISCORD_CLIENT_ID }}" - $env:GH_TOKEN = "${{ secrets.GH_TOKEN }}" - $env:DISCORD_TOKEN = "${{ secrets.DISCORD_TOKEN }}" - $env:DATABASE_URL = "${{ secrets.DATABASE_URL }}" - $env:WOTB_DLC_CDN = "${{ secrets.WOTB_DLC_CDN }}" - bun scripts/applyPatches.ts --depot + run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} WOTB_DLC_CDN=${{ secrets.WOTB_DLC_CDN }} bun scripts/applyPatches.ts --depot - name: Build assets run: | - $env:DISCORD_CLIENT_ID = "${{ secrets.DISCORD_CLIENT_ID }}" - $env:GH_TOKEN = "${{ secrets.GH_TOKEN }}" - $env:DISCORD_TOKEN = "${{ secrets.DISCORD_TOKEN }}" - $env:DATABASE_URL = "${{ secrets.DATABASE_URL }}" - $env:VIDEOS_SHEET = "${{ secrets.VIDEOS_SHEET }}" - $env:GOOGLE_APPLICATION_CREDENTIALS = "${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}" - bun build:assets --all-targets --depot --production + DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} VIDEOS_SHEET=${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS=${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} bun build:assets --all-targets --depot --production From 66e65587bdfc2f8a3780afeb54bdfd441e1cc97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:54:36 -0500 Subject: [PATCH 5/9] fix: update index --- .github/workflows/cd-assets.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index cb917f63a..dee09f85d 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -29,11 +29,12 @@ jobs: run: bun scripts/setupDepotDownloader.ts - name: Run DepotDownloader - run: ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" + run: | + git update-index --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 run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} WOTB_DLC_CDN=${{ secrets.WOTB_DLC_CDN }} bun scripts/applyPatches.ts --depot - name: Build assets - run: | - DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} VIDEOS_SHEET=${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS=${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} bun build:assets --all-targets --depot --production + run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} VIDEOS_SHEET=${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS=${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} bun build:assets --all-targets --depot --production From f7e1b08788fe35426b219a6b4d193ebcbfc9b4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:55:45 -0500 Subject: [PATCH 6/9] fix: add --- .github/workflows/cd-assets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index dee09f85d..9a7349479 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -30,6 +30,7 @@ jobs: - name: Run DepotDownloader run: | + git add temp git update-index --chmod=+x ./temp/depotDownloader/DepotDownloader ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" From ed283d4d2e094cd172314f8be73dbd715fd10655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:56:24 -0500 Subject: [PATCH 7/9] fix: f --- .github/workflows/cd-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index 9a7349479..d61b4affb 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -30,7 +30,7 @@ jobs: - name: Run DepotDownloader run: | - git add temp + git add temp -f git update-index --chmod=+x ./temp/depotDownloader/DepotDownloader ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" From 69676da446d2774954f64bd1fe59ee41382ee838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:57:58 -0500 Subject: [PATCH 8/9] fix: guess the pokemon! --- .github/workflows/cd-assets.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index d61b4affb..4aa8ae3a0 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -30,8 +30,7 @@ jobs: - name: Run DepotDownloader run: | - git add temp -f - git update-index --chmod=+x ./temp/depotDownloader/DepotDownloader + 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 From 2f5e1eeadcadf51d1bb1a7eeffec72c308e284f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:58:58 -0500 Subject: [PATCH 9/9] fix: spaces --- .github/workflows/cd-assets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index 4aa8ae3a0..1f4f3d92a 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -34,7 +34,7 @@ jobs: ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" - name: Apply patches - run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} WOTB_DLC_CDN=${{ secrets.WOTB_DLC_CDN }} bun scripts/applyPatches.ts --depot + run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} WOTB_DLC_CDN=${{ secrets.WOTB_DLC_CDN }} bun scripts/applyPatches.ts --depot - name: Build assets - run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} VIDEOS_SHEET=${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS=${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} bun build:assets --all-targets --depot --production + run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} VIDEOS_SHEET=${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS=${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} bun build:assets --all-targets --depot --production