From 15c979bd2ac2ed4c485a9f00ec6208f505fd1f9b Mon Sep 17 00:00:00 2001
From: Joshua Gilman <joshuagilman@gmail.com>
Date: Fri, 17 Jan 2025 18:18:39 -0800
Subject: [PATCH] ci(general): upgrades CI to v1.7.0 and forge to v0.10.0
 (#1557)

---
 .github/workflows/ci.yml                     |  4 ++--
 .github/workflows/generate-allure-report.yml | 14 ++++++-------
 blueprint.cue                                | 10 ++++++++-
 catalyst_voices/blueprint.cue                | 22 +++++++++++++++-----
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bcf6b159156..c692b0f5856 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,9 +14,9 @@ permissions:
 
 jobs:
   ci:
-    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.3
+    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.0
     with:
-      forge_version: 0.8.0
+      forge_version: 0.10.0
 
   test_reporting:
     if: always()
diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml
index 4751151aaff..5b4303fd504 100644
--- a/.github/workflows/generate-allure-report.yml
+++ b/.github/workflows/generate-allure-report.yml
@@ -26,16 +26,16 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Forge
-        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.0
         with:
-          version: 0.8.0
+          version: 0.10.0
         if: always()
 
       - name: Setup CI
-        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.0
 
       - name: Get catalyst gateway unit test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.0
         if: always()
         continue-on-error: true
         with:
@@ -43,7 +43,7 @@ jobs:
           args: ./catalyst-gateway+build
 
       - name: Get schemathesis test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.0
         if: always()
         continue-on-error: true
         with:
@@ -51,7 +51,7 @@ jobs:
           args: ./catalyst-gateway/tests/schemathesis_tests+test-fuzzer-api
 
       - name: Get flutter unit test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.0
         if: always()
         continue-on-error: true
         with:
@@ -59,7 +59,7 @@ jobs:
           args: ./catalyst_voices+test-unit
 
       - name: Get python api test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.0
         if: always()
         continue-on-error: true
         with:
diff --git a/blueprint.cue b/blueprint.cue
index 99abaf8dfd7..3ef41554ab8 100644
--- a/blueprint.cue
+++ b/blueprint.cue
@@ -38,6 +38,11 @@ global: {
 			}
 
 			github: registry: "ghcr.io"
+
+			kcl: {
+				install: true
+				version: "v0.11.0"
+			}
 		}
 		secrets: [
 			{
@@ -49,7 +54,10 @@ global: {
 		]
 	}
 	deployment: {
-		registry: ci.providers.aws.ecr.registry
+		registries: {
+			containers: ci.providers.aws.ecr.registry
+			modules:    ci.providers.aws.ecr.registry + "/catalyst-deployments"
+		}
 		repo: {
 			url: "https://github.com/input-output-hk/catalyst-world"
 			ref: "master"
diff --git a/catalyst_voices/blueprint.cue b/catalyst_voices/blueprint.cue
index 6a295fb274e..e77b267e50a 100644
--- a/catalyst_voices/blueprint.cue
+++ b/catalyst_voices/blueprint.cue
@@ -8,12 +8,24 @@ project: {
 		}
 		environment: "dev"
 		modules: main: {
-			container: "voices-deployment"
-			version:   "0.1.1"
+			name:    "app"
+			version: "0.2.1"
 			values: {
-				environment: name: "dev"
-				frontend: image: {
-					tag: _ @forge(name="GIT_HASH_OR_TAG")
+				deployment: containers: main: {
+					image: {
+						name: _ @forge(name="CONTAINER_IMAGE")
+						tag:  _ @forge(name="GIT_HASH_OR_TAG")
+					}
+					port: 80
+					probes: {
+						liveness: path:  "/"
+						readiness: path: "/"
+					}
+				}
+				ingress: subdomain: "voices"
+				service: {
+					targetPort: 80
+					port:       80
 				}
 			}
 		}