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 68a3b11e7..312593ef1
Binary files a/bun.lockb and b/bun.lockb differ
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);