From cd2bad3b27c81c62b4952f9b4f6d3b55b21bf754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 8 Jun 2025 17:20:08 +0000 Subject: [PATCH 1/3] feat: asset base --- packages/core/src/blitzkit/asset.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/core/src/blitzkit/asset.ts b/packages/core/src/blitzkit/asset.ts index ef3b57f08..c28d5b65c 100644 --- a/packages/core/src/blitzkit/asset.ts +++ b/packages/core/src/blitzkit/asset.ts @@ -1,12 +1,5 @@ import { assertSecret } from './assertSecret'; -const repo = assertSecret(import.meta.env.PUBLIC_ASSET_REPO); -const branch = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH); -const fastUser = assertSecret(import.meta.env.PUBLIC_ASSET_FAST_USER); -const fastRepo = assertSecret(import.meta.env.PUBLIC_ASSET_FAST_REPO); - export function asset(path: string) { - return branch === 'main' - ? `https://${fastUser}.github.io/${fastRepo}/${path}` - : `https://raw.githubusercontent.com/${repo}/${branch}/${path}`; + return `${assertSecret(import.meta.env.PUBLIC_ASSET_BASE)}/${path}`; } From 470869418cdd49422ff9e125234e9cb3639bc177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 8 Jun 2025 12:24:45 -0500 Subject: [PATCH 2/3] Update website.yml --- .github/workflows/website.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index baea38776..2cd2b475e 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -18,8 +18,6 @@ concurrency: env: PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }} - PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }} - PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }} PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }} ALLOW_ROBOTS: 'true' WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }} @@ -29,8 +27,7 @@ env: WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }} WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }} PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }} - PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }} - PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }} + PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }} jobs: build: From abebfcf6c6264282f668de29408554170c8eae3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 8 Jun 2025 17:32:13 +0000 Subject: [PATCH 3/3] feat: branch --- .github/workflows/website.yml | 1 + bun.lockb | Bin 450480 -> 450480 bytes packages/website/src/components/Footer.astro | 2 +- packages/website/src/components/Navbar.astro | 4 ++-- packages/website/src/components/Plugs.tsx | 2 +- .../components/Tankopedia/CalloutsSection.tsx | 2 +- .../website/src/components/ToolCard.astro | 4 ++-- .../website/src/core/blitzkit/branches.ts | 2 +- .../website/src/pages/[...locale]/index.astro | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) mode change 100644 => 100755 bun.lockb diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 2cd2b475e..48de729b2 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -28,6 +28,7 @@ env: WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }} PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }} PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }} + PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }} jobs: build: diff --git a/bun.lockb b/bun.lockb old mode 100644 new mode 100755 index 68a3b11e7b5eb7cfb53985153d9d9fd9eaf15bea..312593ef1e5954c7f052c411bebd5a61027014a7 GIT binary patch delta 149 zcmdn6UwQ)&?MPQ-V}Jk`S(0}y|44s>Arr$T6yd#ol@{iLzTrlB8#>uzl z#xb%@{un3@7ffc{95qj@ofBpZ+hjv;^~no7IkvA*W#mv{WSG1$(!BkJCnFFu0WmWW Pvj8#c_7|RPC#C`bfB7!s delta 94 zcmdn6UwQ)&?MR>QBg?EYd4VU#<`?M~Od&jlF3!m>=lVlA$()-r=drglvQ0MhHs8KN hm61aQ$Sw>wZ-3#*2*gZ4%nZaVK+L-Rg(usIsQ}gaB#r<8 diff --git a/packages/website/src/components/Footer.astro b/packages/website/src/components/Footer.astro index b4094b9ea..db11b3ba7 100644 --- a/packages/website/src/components/Footer.astro +++ b/packages/website/src/components/Footer.astro @@ -8,7 +8,7 @@ import { LinkI18n } from './LinkI18n'; import { LocaleSwitcherThemeWrapper } from './LocaleSwitcher'; const gameDefinitions = await fetchGameDefinitions(); -const PUBLIC_ASSET_BRANCH = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH); +const PUBLIC_ASSET_BRANCH = assertSecret(import.meta.env.PUBLIC_BRANCH); const locale = Astro.params.locale ?? DEFAULT_LOCALE; const strings = getStrings(locale); --- diff --git a/packages/website/src/components/Navbar.astro b/packages/website/src/components/Navbar.astro index f00e866d6..4074100fc 100644 --- a/packages/website/src/components/Navbar.astro +++ b/packages/website/src/components/Navbar.astro @@ -139,7 +139,7 @@ const strings = getStrings(locale); toolsFiltered.map((tool) => { const unavailableOnBranch = tool.branches?.every( (branch) => - branch !== assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH), + branch !== assertSecret(import.meta.env.PUBLIC_BRANCH), ); const selected = Astro.url.pathname.includes(`/${tool.id}`); const toolStrings = @@ -211,7 +211,7 @@ const strings = getStrings(locale); toolsFiltered.map((tool) => { const unavailableOnBranch = tool.branches?.every( (branch) => - branch !== assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH), + branch !== assertSecret(import.meta.env.PUBLIC_BRANCH), ); if (unavailableOnBranch) return null; diff --git a/packages/website/src/components/Plugs.tsx b/packages/website/src/components/Plugs.tsx index 59c3a9dcf..d366c5d20 100644 --- a/packages/website/src/components/Plugs.tsx +++ b/packages/website/src/components/Plugs.tsx @@ -14,7 +14,7 @@ export function Plugs() { function Content() { const promoteOpentest = assertSecret(import.meta.env.PUBLIC_PROMOTE_OPENTEST) === 'true' && - assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH) !== 'opentest'; + assertSecret(import.meta.env.PUBLIC_BRANCH) !== 'opentest'; const promotions = [promoteOpentest]; if (promotions.every((promotion) => !promotion)) return null; diff --git a/packages/website/src/components/Tankopedia/CalloutsSection.tsx b/packages/website/src/components/Tankopedia/CalloutsSection.tsx index 4c139ffab..858d114d7 100644 --- a/packages/website/src/components/Tankopedia/CalloutsSection.tsx +++ b/packages/website/src/components/Tankopedia/CalloutsSection.tsx @@ -15,7 +15,7 @@ export function CalloutsSection() { const tank = Duel.use((state) => state.protagonist.tank); const mutateTankopediaPersistent = TankopediaPersistent.useMutation(); const promoteAeson = - assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH) === 'preview'; + assertSecret(import.meta.env.PUBLIC_BRANCH) === 'preview'; useEffect(() => { mutateTankopediaPersistent((draft) => { diff --git a/packages/website/src/components/ToolCard.astro b/packages/website/src/components/ToolCard.astro index d66f8e922..863e75b03 100644 --- a/packages/website/src/components/ToolCard.astro +++ b/packages/website/src/components/ToolCard.astro @@ -12,7 +12,7 @@ interface Props { const { tool } = Astro.props; const disabled = tool.branches?.every( - (branch) => branch !== assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH), + (branch) => branch !== assertSecret(import.meta.env.PUBLIC_BRANCH), ); const { locale } = Astro.params; const strings = getStrings(locale); @@ -108,7 +108,7 @@ const toolStrings = disabled ? ( <> Unavailable on{' '} - {assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)} + {assertSecret(import.meta.env.PUBLIC_BRANCH)} ) : ( toolStrings.description diff --git a/packages/website/src/core/blitzkit/branches.ts b/packages/website/src/core/blitzkit/branches.ts index 8c8158063..2b3c5a9b3 100644 --- a/packages/website/src/core/blitzkit/branches.ts +++ b/packages/website/src/core/blitzkit/branches.ts @@ -5,7 +5,7 @@ export function resolveBranchName(locale: string = DEFAULT_LOCALE) { if (!(locale in STRINGS)) throw new Error(`Unsupported locale: ${locale}`); const strings = STRINGS[locale as SupportedLocale]; - const secret = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH); + const secret = assertSecret(import.meta.env.PUBLIC_BRANCH); if ( assertSecret(import.meta.env.MODE) === 'development' && diff --git a/packages/website/src/pages/[...locale]/index.astro b/packages/website/src/pages/[...locale]/index.astro index 553fb02d8..e1ba862ac 100644 --- a/packages/website/src/pages/[...locale]/index.astro +++ b/packages/website/src/pages/[...locale]/index.astro @@ -24,7 +24,7 @@ import { import { getStrings } from '../../core/i18n/getStrings'; import BaseLayout from '../../layouts/BaseLayout.astro'; -const PUBLIC_ASSET_BRANCH = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH); +const PUBLIC_ASSET_BRANCH = assertSecret(import.meta.env.PUBLIC_BRANCH); const MODE = assertSecret(import.meta.env.MODE); const locale = Astro.params.locale ?? DEFAULT_LOCALE; const strings = getStrings(Astro.params.locale);