diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index 6440c3f..322c347 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -18,11 +18,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver-opts: network=host - name: Login to Docker Hub uses: docker/login-action@v3 @@ -50,30 +49,19 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - changelog: - name: Generate Changelog + release: runs-on: ubuntu-latest - needs: build-and-push - outputs: - release_body: ${{ steps.git-cliff.outputs.content }} steps: - - name: Checkout - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Generate a changelog - uses: orhun/git-cliff-action@v4 - id: git-cliff + + - name: Set node + uses: actions/setup-node@v4 with: - config: git-cliff-config/cliff.toml - args: -vv --latest --strip 'footer' + registry-url: https://registry.npmjs.org/ + node-version: lts/* + + - run: npx changelogithub env: - OUTPUT: CHANGES.md - - name: Release - uses: softprops/action-gh-release@v2 - if: startsWith(github.ref, 'refs/tags/') - with: - body: ${{ steps.git-cliff.outputs.content }} - token: ${{ secrets.GITHUB_TOKEN }} - env: - GITHUB_REPOSITORY: ${{ github.repository }} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/Dockerfile b/Dockerfile index 776669f..e739a9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM oven/bun:1 AS base +FROM --platform=$BUILDPLATFORM oven/bun:1 AS base # Stage 1: Install dependencies FROM base AS deps diff --git a/app/[locale]/(main)/ClientComponents/ServerOverviewClient.tsx b/app/[locale]/(main)/ClientComponents/ServerOverviewClient.tsx index ebfa63c..764ca38 100644 --- a/app/[locale]/(main)/ClientComponents/ServerOverviewClient.tsx +++ b/app/[locale]/(main)/ClientComponents/ServerOverviewClient.tsx @@ -18,13 +18,16 @@ export default function ServerOverviewClient() { ); const disableCartoon = getEnv("NEXT_PUBLIC_DisableCartoon") === "true"; - if (error) + if (error) { return (
-

{error.message}

+

+ Error status:{error.status} {error.info?.cause ?? error.message} +

{t("error_message")}

); + } return ( <> diff --git a/app/[locale]/(main)/footer.tsx b/app/[locale]/(main)/footer.tsx index 7d2fb36..ce8334e 100644 --- a/app/[locale]/(main)/footer.tsx +++ b/app/[locale]/(main)/footer.tsx @@ -1,7 +1,9 @@ +import pack from "@/package.json"; import { useTranslations } from "next-intl"; export default function Footer() { const t = useTranslations("Footer"); + const version = pack.version; return (