Skip to content

Commit b5cea08

Browse files
committed
misc: updated workflow
1 parent 9a5c277 commit b5cea08

File tree

6 files changed

+26
-3
lines changed

6 files changed

+26
-3
lines changed

.github/workflows/build-image.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,21 @@ jobs:
7272
type=sha,prefix={{branch}}-
7373
type=raw,value=latest,enable={{is_default_branch}}
7474
75+
- name: Set beta flag
76+
id: beta
77+
run: |
78+
if [ "${{ github.ref_name }}" = "dev" ]; then
79+
echo "value=true" >> $GITHUB_OUTPUT
80+
else
81+
echo "value=false" >> $GITHUB_OUTPUT
82+
fi
83+
84+
- name: Log build info
85+
run: |
86+
echo "Building for branch: ${{ github.ref_name }}"
87+
echo "Beta mode: ${{ steps.beta.outputs.value }}"
88+
echo "Platform: ${{ inputs.platform }}"
89+
7590
- name: Build and push Docker image
7691
uses: docker/build-push-action@v5
7792
with:
@@ -94,4 +109,5 @@ jobs:
94109
NEXT_PUBLIC_TURNSTILE_SITE_KEY=${{ secrets.NEXT_PUBLIC_TURNSTILE_SITE_KEY }}
95110
NEXT_PUBLIC_AXIOM_DATASET=${{ secrets.NEXT_PUBLIC_AXIOM_DATASET }}
96111
NEXT_PUBLIC_AXIOM_TOKEN=${{ secrets.NEXT_PUBLIC_AXIOM_TOKEN }}
112+
NEXT_PUBLIC_BETA=${{ steps.beta.outputs.value }}
97113
CI=true

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ ARG NEXT_PUBLIC_IMGUR_CLIENT_ID
3636
ARG NEXT_PUBLIC_TURNSTILE_SITE_KEY
3737
ARG NEXT_PUBLIC_AXIOM_DATASET
3838
ARG NEXT_PUBLIC_AXIOM_TOKEN
39+
ARG NEXT_PUBLIC_BETA
3940

4041
ENV CI=${CI:-false}
4142
ENV NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL
@@ -48,6 +49,7 @@ ENV NEXT_PUBLIC_IMGUR_CLIENT_ID=$NEXT_PUBLIC_IMGUR_CLIENT_ID
4849
ENV NEXT_PUBLIC_TURNSTILE_SITE_KEY=$NEXT_PUBLIC_TURNSTILE_SITE_KEY
4950
ENV NEXT_PUBLIC_AXIOM_DATASET=$NEXT_PUBLIC_AXIOM_DATASET
5051
ENV NEXT_PUBLIC_AXIOM_TOKEN=$NEXT_PUBLIC_AXIOM_TOKEN
52+
ENV NEXT_PUBLIC_BETA=$NEXT_PUBLIC_BETA
5153

5254

5355
RUN bunx prisma generate --no-hints

src/app/[locale]/(public)/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default async function RootLayout({
1414
const user = await isAuthenticated({ bypassCache: true });
1515
const t = await getTranslations();
1616

17-
const isBeta = env.NEXT_PUBLIC_BETTER_AUTH_URL?.includes("beta");
17+
const isBeta = env.NEXT_PUBLIC_BETA ?? false;
1818

1919
return (
2020
<>

src/app/robots.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { MetadataRoute } from "next";
22
import { env } from "@/lib/env";
33

44
export default function robots(): MetadataRoute.Robots {
5-
const isBeta = env.NEXT_PUBLIC_BETTER_AUTH_URL?.includes("beta");
5+
const isBeta = env.NEXT_PUBLIC_BETA ?? false;
66

77
return {
88
rules: {

src/components/sidebar/app-sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export function AppSidebar(props: AppSidebarProps) {
6767
const t = useTranslations();
6868
const [isMac, setIsMac] = useState(false);
6969

70-
const isBeta = env.NEXT_PUBLIC_BETTER_AUTH_URL?.includes("beta");
70+
const isBeta = env.NEXT_PUBLIC_BETA ?? false;
7171

7272
useEffect(() => {
7373
// Detect if user is on macOS

src/lib/env.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ export const env = createEnv({
3434
NEXT_PUBLIC_TURNSTILE_SITE_KEY: z.string().min(1),
3535
NEXT_PUBLIC_AXIOM_DATASET: z.string().min(1),
3636
NEXT_PUBLIC_AXIOM_TOKEN: z.string().min(1),
37+
NEXT_PUBLIC_BETA: z
38+
.string()
39+
.optional()
40+
.transform((val) => (val ?? "false") === "true"),
3741
},
3842
experimental__runtimeEnv: {
3943
NEXT_PUBLIC_CDN_URL: process.env.NEXT_PUBLIC_CDN_URL,
@@ -46,5 +50,6 @@ export const env = createEnv({
4650
NEXT_PUBLIC_TURNSTILE_SITE_KEY: process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY,
4751
NEXT_PUBLIC_AXIOM_DATASET: process.env.NEXT_PUBLIC_AXIOM_DATASET,
4852
NEXT_PUBLIC_AXIOM_TOKEN: process.env.NEXT_PUBLIC_AXIOM_TOKEN,
53+
NEXT_PUBLIC_BETA: process.env.NEXT_PUBLIC_BETA,
4954
},
5055
});

0 commit comments

Comments
 (0)