diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b6a74bd4..54929e4d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -104,13 +104,13 @@ jobs: DOCKER_METADATA_PR_HEAD_SHA: true - name: get date - run: echo "BUILD_TIMESTAMP=$(git show -s --format=%cI)" >> $GITHUB_ENV + run: echo "GIT_TIMESTAMP=$(git show -s --format=%cI)" >> $GITHUB_ENV - uses: docker/build-push-action@v4 with: build-args: | VITE_APP_GIT_SHA=${{ github.event_name == 'push' && github.sha || github.event.pull_request.head.sha }} - VITE_APP_BUILD_TIMESTAMP=${{ env.BUILD_TIMESTAMP }} + VITE_APP_GIT_TIMESTAMP=${{ env.GIT_TIMESTAMP }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_RELEASE=${{ github.event_name == 'push' && github.sha || github.event.pull_request.head.sha }} builder: ${{ steps.buildx.outputs.name }} diff --git a/Dockerfile b/Dockerfile index 65b3aebe..19d3917f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,11 +14,11 @@ ADD . ./ RUN pnpm install --offline ARG VITE_APP_GIT_SHA=unknown -ARG VITE_APP_BUILD_TIMESTAMP=1970-01-01T00:00:00Z +ARG VITE_APP_COMMIT_TIMESTAMP=1970-01-01T00:00:00Z ARG SENTRY_AUTH_TOKEN ARG SENTRY_RELEASE ENV VITE_APP_GIT_SHA $VITE_APP_GIT_SHA -ENV VITE_APP_BUILD_TIMESTAMP $VITE_APP_BUILD_TIMESTAMP +ENV VITE_APP_COMMIT_TIMESTAMP $VITE_APP_COMMIT_TIMESTAMP ENV SENTRY_AUTH_TOKEN $SENTRY_AUTH_TOKEN ENV SENTRY_RELEASE $SENTRY_RELEASE RUN pnpm build:production diff --git a/go/build.sh b/go/build.sh index 2acdd657..94d896cf 100755 --- a/go/build.sh +++ b/go/build.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash cd "$(dirname "$0")" -docker compose build --build-arg VITE_APP_GIT_SHA=$(git show -s --format=%H) --build-arg VITE_APP_BUILD_TIMESTAMP=$(git show -s --format=%cI) +docker compose build --build-arg VITE_APP_GIT_SHA=$(git show -s --format=%H) --build-arg VITE_APP_COMMIT_TIMESTAMP=$(git show -s --format=%cI) diff --git a/src/components/ErrorFallback.jsx b/src/components/ErrorFallback.jsx index 54f8eeb1..b905e87c 100644 --- a/src/components/ErrorFallback.jsx +++ b/src/components/ErrorFallback.jsx @@ -31,7 +31,7 @@ const ErrorFallback = ({ error, componentStack }) => { }, []); const information = `connect version: ${import.meta.env.VITE_APP_GIT_SHA || 'unknown'} -Build timestamp: ${import.meta.env.VITE_APP_BUILD_TIMESTAMP || 'unknown'} +Build timestamp: ${import.meta.env.VITE_APP_COMMIT_TIMESTAMP || 'unknown'} URL: ${window.location.href} Browser: ${window.navigator.userAgent} diff --git a/src/index.jsx b/src/index.jsx index 1c301484..6eb34e44 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -16,9 +16,11 @@ if (window.SENTRY_ENV) { }); } -console.info('Mode:', import.meta.env.MODE || 'unknown'); -console.info('App version:', import.meta.env.VITE_APP_GIT_SHA || 'dev'); -console.info('Build timestamp:', import.meta.env.VITE_APP_BUILD_TIMESTAMP || 'unknown'); +console.info('mode:', import.meta.env.MODE || 'unknown'); +console.info('connect version:', import.meta.env.VITE_APP_GIT_SHA || 'dev'); +if (import.meta.env.VITE_APP_GIT_COMMIT_TIMESTAMP) { + console.info('commit date:', import.meta.env.VITE_APP_GIT_COMMIT_TIMESTAMP || 'unknown'); +} ReactDOM.createRoot(document.getElementById('root')).render((