ci(general): updates to v1.2.1 and forge v0.4.0 (#1035)

* chore(ci): updates to v1.2.1 and forge 0.4.0 * fix: updates test report workflow * wip: use local version of allure workflow
input-output-hk · Oct 22, 2024 · f78f326 · f78f326
1 parent c93d691
commit f78f326
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches: [main]
-    tags: ['*']
+    tags: ['**']
   pull_request:
 
 permissions:
@@ -14,11 +14,11 @@ permissions:
 
 jobs:
   ci:
-    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.1.0
+    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.2.1
     with:
-      forge_version: 0.2.1
+      forge_version: 0.4.0
 
   test_reporting:
     if: always()
     needs: ci
-    uses: input-output-hk/catalyst-voices/.github/workflows/generate-allure-report.yml@main
+    uses: ./.github/workflows/generate-allure-report.yml
diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml
@@ -26,39 +26,45 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Forge
-        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.1.0
+        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.2.1
+        with:
+          version: 0.4.0
         if: always()
 
       - name: Setup CI
-        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.1.0
+        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.2.1
 
       - name: Get catalyst gateway unit test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.1.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.2.1
         if: always()
         continue-on-error: true
         with:
-          path: ./catalyst-gateway+build
+          command: run
+          args: ./catalyst-gateway+build
 
       - name: Get schemathesis test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.1.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.2.1
         if: always()
         continue-on-error: true
         with:
-          path: ./catalyst-gateway/tests/schemathesis_tests+test-fuzzer-api
+          command: run
+          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.1.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.2.1
         if: always()
         continue-on-error: true
         with:
-          path: ./catalyst_voices+test-unit
+          command: run
+          args: ./catalyst_voices+test-unit
 
       - name: Get python api test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.1.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.2.1
         if: always()
         continue-on-error: true
         with:
-          path: ./catalyst-gateway/tests/api_tests+test
+          command: run
+          args: ./catalyst-gateway/tests/api_tests+test
 
       - name: Collect and upload test reports
         uses: actions/upload-artifact@v4

diff --git a/blueprint.cue b/blueprint.cue
@@ -6,8 +6,6 @@ global: {
 			"^build(-.*)?$",
 			"^package(-.*)?$",
 			"^test(-.*)?$",
-			"^release(-.*)?$",
-			"^publish(-.*)?$",
 		]
 		registries: [
 			ci.providers.aws.registry,
@@ -49,9 +47,6 @@ global: {
 				path:     "GITHUB_TOKEN"
 			},
 		]
-		tagging: {
-			strategy: "commit"
-		}
 	}
 	deployment: {
 		registry: ci.providers.aws.registry
@@ -61,4 +56,8 @@ global: {
 		}
 		root: "k8s"
 	}
+	repo: {
+		defaultBranch: "main"
+		name:          "input-output-hk/catalyst-voices"
+	}
 }
diff --git a/catalyst-gateway/Earthfile b/catalyst-gateway/Earthfile
@@ -16,7 +16,7 @@ COPY_SRC:
 
 # builder : Set up our target toolchains, and copy our files.
 builder:
-    DO rust-ci+SETUP 
+    DO rust-ci+SETUP
 
 # sync-cfg: Synchronize local config with CI version.
 # Must be run by the developer manually.
@@ -36,7 +36,7 @@ builder-src:
 
     # Generate Checksums of the source
     DO rust-ci+FINGERPRINT_SRC
-    SAVE ARTIFACT ../src_fingerprint.txt 
+    SAVE ARTIFACT ../src_fingerprint.txt
 
 ## -----------------------------------------------------------------------------
 ##
@@ -89,7 +89,7 @@ package:
     ENTRYPOINT [ "./cat-gateway", "run" ]
 
 # Publish cat-gateway
-publish:
+docker:
    FROM +package
 
    ARG container="cat-gateway"
@@ -109,7 +109,7 @@ check-builder-src-cache:
 
     # Don't build the src in the home directory itself, because it contains stuff.
     WORKDIR $HOME/build
-    RUN rm -rf *    
+    RUN rm -rf *
 
     COPY +builder-src/src_fingerprint.txt ..
 

diff --git a/catalyst-gateway/blueprint.cue b/catalyst-gateway/blueprint.cue
@@ -1,2 +1,15 @@
 version: "1.0.0"
-project: name: "gateway"
+project: {
+	name: "gateway"
+	release: {
+		docker: {
+			on: {
+				merge: {}
+				tag: {}
+			}
+			config: {
+				tag: _ @forge(name="GIT_COMMIT_HASH")
+			}
+		}
+	}
+}
diff --git a/catalyst_voices/Earthfile b/catalyst_voices/Earthfile
@@ -87,7 +87,7 @@ package:
 
     SAVE IMAGE voices-frontend:$tag
 
-publish:
+docker:
    FROM +package
 
    ARG container="voices"

diff --git a/catalyst_voices/blueprint.cue b/catalyst_voices/blueprint.cue
@@ -9,9 +9,20 @@ project: {
 			values: {
 				environment: name: "dev"
 				frontend: image: {
-					tag: _ @env(name="GIT_IMAGE_TAG",type="string")
+					tag: _ @forge(name="GIT_COMMIT_HASH")
 				}
 			}
 		}
 	}
+	release: {
+		docker: {
+			on: {
+				merge: {}
+				tag: {}
+			}
+			config: {
+				tag: _ @forge(name="GIT_COMMIT_HASH")
+			}
+		}
+	}
 }