Skip to content

Commit 4550681

Browse files
committed
feat: builtAt
1 parent e89d85a commit 4550681

File tree

6 files changed

+14
-4
lines changed

6 files changed

+14
-4
lines changed

.github/workflows/shared-build-and-deploy.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
outputs:
2929
image-name: ${{ steps.vars.outputs.image_name }}
3030
sha-short: ${{ steps.vars.outputs.sha_short }}
31+
built-at: ${{ steps.vars.outputs.built_at }}
3132
steps:
3233
- name: Checkout repository
3334
uses: actions/checkout@v4
@@ -41,6 +42,7 @@ jobs:
4142
echo "image_name=$image_name" >> $GITHUB_OUTPUT
4243
sha_short=$(echo "$(git rev-parse --short HEAD)" | tr '[:upper:]' '[:lower:]')
4344
echo "sha_short=$sha_short" >> $GITHUB_OUTPUT
45+
echo "built_at=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_OUTPUT
4446
4547
# Login against a Docker registry except on PR
4648
# https://github.com/docker/login-action
@@ -79,6 +81,7 @@ jobs:
7981
build-args: |
8082
VITE_BRANCH_NAME=${{ inputs.branchName }}
8183
VITE_GIT_SHA=${{ steps.vars.outputs.sha_short }}
84+
VITE_BUILT_AT=${{ steps.vars.outputs.built_at }}
8285
8386
deploy:
8487
runs-on: ubuntu-latest
@@ -109,6 +112,7 @@ jobs:
109112
with:
110113
inlineScript: |
111114
RESOURCE_GROUP="${{ env.RESOURCE_GROUP }}"
115+
BUILT_AT="${{ needs.build.outputs.built-at }}"
112116
BRANCH_NAME="${{ inputs.branchName }}"
113117
SHA_SHORT="${{ needs.build.outputs.sha-short }}"
114118
REF_SHA="${{ inputs.branchName }}.${{ needs.build.outputs.sha-short }}"
@@ -137,6 +141,7 @@ jobs:
137141
containerRegistryPassword=${{ secrets.PACKAGES_TOKEN }} \
138142
branchName="$BRANCH_NAME" \
139143
gitSha="$SHA_SHORT" \
144+
builtAt="$BUILT_AT" \
140145
workspaceName='shared-log-analytics' \
141146
appInsightsName='shared-app-insights' \
142147
managedEnvironmentName='shared-env' \

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ FROM base AS build-client
1313

1414
ARG VITE_BRANCH_NAME="UNKNOWN"
1515
ARG VITE_GIT_SHA="UNKNOWN"
16+
ARG VITE_BUILT_AT="UNKNOWN"
1617

1718
WORKDIR /client
1819

1920
COPY src/client/package.json src/client/pnpm-lock.yaml ./
2021
RUN pnpm i --frozen-lockfile
2122

2223
COPY src/client ./
23-
RUN VITE_BRANCH_NAME=${VITE_BRANCH_NAME} VITE_GIT_SHA=${VITE_GIT_SHA} pnpm run build
24+
RUN VITE_BRANCH_NAME=${VITE_BRANCH_NAME} VITE_GIT_SHA=${VITE_GIT_SHA} VITE_BUILT_AT=${VITE_BUILT_AT} pnpm run build
2425

2526
##
2627
## IMAGE: build-server

infra/main.bicep

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ param containerRegistryPassword string
77

88
param branchName string
99
param gitSha string
10+
param builtAt string
1011

1112
param workspaceName string
1213
param appInsightsName string
@@ -144,6 +145,7 @@ resource webServiceContainerApp 'Microsoft.App/containerApps@2024-03-01' = {
144145
}
145146
{ name: 'APPSETTINGS_BRANCH_NAME', value: branchName }
146147
{ name: 'APPSETTINGS_GIT_SHA', value: gitSha }
148+
{ name: 'APPSETTINGS_BUILT_AT', value: builtAt }
147149
]
148150
}
149151
]

src/client/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en" data-branch-name="%VITE_BRANCH_NAME%" data-git-sha="%VITE_GIT_SHA%">
2+
<html lang="en" data-branch-name="%VITE_BRANCH_NAME%" data-git-sha="%VITE_GIT_SHA%" data-built-at="%VITE_BUILT_AT%">
33
<head>
44
<meta charset="UTF-8" />
55
<link rel="shortcut icon" href="/favicon.ico" />

src/server/src/config.ts

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export interface IConfig {
77
prayerRequestRecipientEmail: string;
88
branchName: string;
99
gitSha: string;
10+
builtAt: string;
1011
}
1112

1213
const config: IConfig = {
@@ -18,6 +19,7 @@ const config: IConfig = {
1819
prayerRequestRecipientEmail: process.env.APPSETTINGS_PRAYER_REQUEST_RECIPIENT_EMAIL ?? 'unknown',
1920
branchName: process.env.APPSETTINGS_BRANCH_NAME ?? 'unknown',
2021
gitSha: process.env.APPSETTINGS_GIT_SHA ?? 'unknown',
22+
builtAt: process.env.APPSETTINGS_BUILT_AT ?? 'unknown',
2123
};
2224

2325
export { config };

src/server/src/routes/statusGET.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { config } from '../config';
55
export function statusGET(): Router.IMiddleware<unknown, unknown> {
66
return async (ctx, _next) => {
77
try {
8-
const { branchName, gitSha } = config;
9-
ctx.body = { 'branch-name': branchName, 'git-sha': gitSha };
8+
const { branchName, gitSha, builtAt } = config;
9+
ctx.body = { 'branch-name': branchName, 'git-sha': gitSha, 'built-at': builtAt };
1010
} catch (exc) {
1111
console.error(exc instanceof Error ? exc.message : exc);
1212

0 commit comments

Comments
 (0)