From 80acacb5cc87e855daea105beab4ff5bac410637 Mon Sep 17 00:00:00 2001
From: ctot-nondef <christoph.hoffmann@oeaw.ac.at>
Date: Mon, 11 Nov 2024 15:25:11 +0100
Subject: [PATCH 1/6] feat: include commit hashes in footer

---
 components/app-footer.vue | 17 ++++++++++++++++-
 nuxt.config.ts            |  1 +
 package.json              |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/components/app-footer.vue b/components/app-footer.vue
index 4c86b77..ed8dea7 100644
--- a/components/app-footer.vue
+++ b/components/app-footer.vue
@@ -1,4 +1,7 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+const env = useRuntimeConfig();
+const { data: config } = useProjectInfo();
+</script>
 
 <template>
 	<footer
@@ -18,6 +21,18 @@
 			</span>
 			<span>|</span>
 			<NuxtLink class="hover:underline hover:underline-offset-2" href="/imprint">Imprint</NuxtLink>
+			<span>|</span>
+			<span class="flex gap-1">
+				<span>Frontend: {{ env.public.currentGitSha }}</span>
+			</span>
+			<span>|</span>
+			<span class="flex gap-1">
+				<span>Backend: {{ config?.projectConfig?.version?.backend }}</span>
+			</span>
+			<span>|</span>
+			<span class="flex gap-1">
+				<span>Data: {{ config?.projectConfig?.version?.data }}</span>
+			</span>
 			<div
 				class="h-4 flex-1"
 				onmouseover="document.querySelector('footer').classList.add('-translate-y-80')"
diff --git a/nuxt.config.ts b/nuxt.config.ts
index a8eb57e..17b50d5 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -62,6 +62,7 @@ export default defineNuxtConfig({
 			teiBaseurl: process.env.NUXT_PUBLIC_TEI_BASEURL,
 			apiUser: process.env.NUXT_PUBLIC_API_USER,
 			apiPass: process.env.NUXT_PUBLIC_API_PASS,
+			currentGitSha: process.env.NUXT_PUBLIC_CURRENT_GIT_SHA,
 		},
 	},
 
diff --git a/package.json b/package.json
index d3f6a50..b1e15d8 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
 	"packageManager": "pnpm@9.10.0+sha256.355a8ab8dbb6ad41befbef39bc4fd6b5df85e12761d2724bd01f13e878de4b13",
 	"scripts": {
 		"analyze": "nuxt analyze",
-		"build": "run-s generate:api-client build:client",
+		"build": "NUXT_PUBLIC_CURRENT_GIT_SHA=$(git rev-parse HEAD) && run-s generate:api-client build:client",
 		"build:client": "nuxt build --dotenv ./.env.local",
-		"dev": "nuxt dev --dotenv ./.env.local --host 127.0.0.1 --no-fork",
+		"dev": "NUXT_PUBLIC_CURRENT_GIT_SHA=$(git rev-parse HEAD) && nuxt dev --dotenv ./.env.local --host 127.0.0.1 --no-fork",
 		"format:check": "prettier . --cache --check --ignore-path ./.gitignore",
 		"format:fix": "pnpm run format:check --write",
 		"generate:api-client": "swagger-typescript-api --path \"https://raw.githubusercontent.com/acdh-oeaw/vicav-app-api/master/openapi.json\" --clean-output --name index.ts --output ./lib/api-client/",

From 54ec169fa4cb3c0a76024c86bb17a5f3ef19d864 Mon Sep 17 00:00:00 2001
From: ctot-nondef <christoph.hoffmann@oeaw.ac.at>
Date: Mon, 11 Nov 2024 16:33:26 +0100
Subject: [PATCH 2/6] feat: set commit hash env var in prod as well

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b1e15d8..fd2d79f 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
 		"prepare": "run-s setup generate:api-client",
 		"setup": "is-ci || simple-git-hooks",
 		"start:preview": "nuxt preview --dotenv ./.env.local",
-		"start": "node .output/server/index.mjs",
+		"start": "NUXT_PUBLIC_CURRENT_GIT_SHA=$(git rev-parse HEAD) && node .output/server/index.mjs",
 		"start:local": "dotenv -e .env.local -- pnpm run start",
 		"test": "dotenv -e .env.local -- node checkenv.mjs && pnpm playwright install && pnpm validate",
 		"test:e2e": "playwright test",

From 2ffc373fd705d2b14b6e3be6f0051019faf11364 Mon Sep 17 00:00:00 2001
From: Omar Siam <omar.siam@oeaw.ac.at>
Date: Mon, 11 Nov 2024 16:34:32 +0100
Subject: [PATCH 3/6] We use git describe in the backend

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b1e15d8..9b105ed 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
 	"packageManager": "pnpm@9.10.0+sha256.355a8ab8dbb6ad41befbef39bc4fd6b5df85e12761d2724bd01f13e878de4b13",
 	"scripts": {
 		"analyze": "nuxt analyze",
-		"build": "NUXT_PUBLIC_CURRENT_GIT_SHA=$(git rev-parse HEAD) && run-s generate:api-client build:client",
+		"build": "NUXT_PUBLIC_CURRENT_GIT_SHA=$(git describe --tags --always) && run-s generate:api-client build:client",
 		"build:client": "nuxt build --dotenv ./.env.local",
-		"dev": "NUXT_PUBLIC_CURRENT_GIT_SHA=$(git rev-parse HEAD) && nuxt dev --dotenv ./.env.local --host 127.0.0.1 --no-fork",
+		"dev": "NUXT_PUBLIC_CURRENT_GIT_SHA=$(git describe --tags --always) && nuxt dev --dotenv ./.env.local --host 127.0.0.1 --no-fork",
 		"format:check": "prettier . --cache --check --ignore-path ./.gitignore",
 		"format:fix": "pnpm run format:check --write",
 		"generate:api-client": "swagger-typescript-api --path \"https://raw.githubusercontent.com/acdh-oeaw/vicav-app-api/master/openapi.json\" --clean-output --name index.ts --output ./lib/api-client/",

From 70f7772e0620384fb0d6136b489cbbe221fa3681 Mon Sep 17 00:00:00 2001
From: Omar Siam <omar.siam@oeaw.ac.at>
Date: Mon, 11 Nov 2024 16:49:39 +0100
Subject: [PATCH 4/6] We need git to get the version for the frontend

---
 .dockerignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 1e30da2..e5ebabd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -39,10 +39,6 @@ dist
 
 ## .dockerignore ##
 
-# git
-.git/
-.gitignore
-
 # github
 .github/
 

From d6c640d6ccbf967371d5b02400a557f319f97d34 Mon Sep 17 00:00:00 2001
From: Omar Siam <omar.siam@oeaw.ac.at>
Date: Mon, 11 Nov 2024 16:54:42 +0100
Subject: [PATCH 5/6] Try using cloud native buildpack

---
 .github/workflows/starter.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/starter.yaml b/.github/workflows/starter.yaml
index 34c4f49..dcec8b7 100644
--- a/.github/workflows/starter.yaml
+++ b/.github/workflows/starter.yaml
@@ -16,6 +16,7 @@ jobs:
       environment: ${{ steps.get_environment_from_git_ref.outputs.environment }}
       environment_short: ${{ steps.get_environment_from_git_ref.outputs.environment_short }}
       image_name: nuxt-vicav
+      source_image: nuxt-vicav/source
       registry_root: ghcr.io/${{ github.repository }}/
       default_port: "3000"
       fetch-depth: 10
@@ -133,13 +134,14 @@ jobs:
         generate_workflow_vars_tunocent,
         generate_workflow_vars_shawi,
       ]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-herokuish-and-push-to-registry.yaml@main
+    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-cnb-and-push-to-registry.yaml@main
     secrets: inherit
     # if you run this outside of of an org that provides KUBE_CONFIG etc as a secret, you need to specify every secret you want to pass by name
     with:
       environment: ${{ needs.generate_workflow_vars.outputs.environment }}
       registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
       image_name: ${{ needs.setup_workflow_env.outputs.image_name }}
+      source_image: ${{ needs.setup_workflow_env.outputs.source_image }}
       default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
       PUBLIC_URL: ${{ needs.generate_workflow_vars.outputs.PUBLIC_URL }}
       fetch-depth: ${{ fromJson(needs.setup_workflow_env.outputs.fetch-depth) }}

From 4ec52e6e777abcf6a7413c0df5246166be14a013 Mon Sep 17 00:00:00 2001
From: Omar Siam <omar.siam@oeaw.ac.at>
Date: Mon, 11 Nov 2024 17:13:51 +0100
Subject: [PATCH 6/6] Revert "Try using cloud native buildpack"

This reverts commit d6c640d6ccbf967371d5b02400a557f319f97d34.
---
 .github/workflows/starter.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/starter.yaml b/.github/workflows/starter.yaml
index dcec8b7..34c4f49 100644
--- a/.github/workflows/starter.yaml
+++ b/.github/workflows/starter.yaml
@@ -16,7 +16,6 @@ jobs:
       environment: ${{ steps.get_environment_from_git_ref.outputs.environment }}
       environment_short: ${{ steps.get_environment_from_git_ref.outputs.environment_short }}
       image_name: nuxt-vicav
-      source_image: nuxt-vicav/source
       registry_root: ghcr.io/${{ github.repository }}/
       default_port: "3000"
       fetch-depth: 10
@@ -134,14 +133,13 @@ jobs:
         generate_workflow_vars_tunocent,
         generate_workflow_vars_shawi,
       ]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-cnb-and-push-to-registry.yaml@main
+    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-herokuish-and-push-to-registry.yaml@main
     secrets: inherit
     # if you run this outside of of an org that provides KUBE_CONFIG etc as a secret, you need to specify every secret you want to pass by name
     with:
       environment: ${{ needs.generate_workflow_vars.outputs.environment }}
       registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
       image_name: ${{ needs.setup_workflow_env.outputs.image_name }}
-      source_image: ${{ needs.setup_workflow_env.outputs.source_image }}
       default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
       PUBLIC_URL: ${{ needs.generate_workflow_vars.outputs.PUBLIC_URL }}
       fetch-depth: ${{ fromJson(needs.setup_workflow_env.outputs.fetch-depth) }}