improve artifacts and build job dependency flakes for cachix

input-output-hk · Feb 19, 2021 · 096fd6b · 096fd6b
1 parent 766cf8d
commit 096fd6b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
@@ -21,4 +21,5 @@ jobs:
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     - run: nix run .#checkFmt
     - run: nix run .#checkCue
+    - run: nix run .#buildJobFlakes
     - run: nix -L build .#devShellPath
diff --git a/deploy.cue b/deploy.cue
@@ -6,11 +6,24 @@ import (
 
 let fqdn = "vit.iohk.io"
 
-let Namespace = {
+_defaultJobs: {
+	"leader-0":          #Jormungandr & {#role: "leader", #index:   0}
+	"leader-1":          #Jormungandr & {#role: "leader", #index:   1}
+	"leader-2":          #Jormungandr & {#role: "leader", #index:   2}
+	"follower-0":        #Jormungandr & {#role: "follower", #index: 0}
+	"servicing-station": #ServicingStation
+}
+
+artifacts: [string]: [string]: {url: string, checksum: string}
+
+Namespace: [Name=_]: {
 	vars: {
 		let hex = "[0-9a-f]"
 		let datacenter = "eu-central-1" | "us-east-2" | "eu-west-1"
 
+		namespace:   Name
+		#block0:     artifacts[Name].block0
+		#database:   artifacts[Name].database
 		namespace:   string
 		#domain:     string
 		#vitOpsRev:  =~"^\(hex){40}$" | *"c9251b4f3f0b34a22e3968bf28d5a049da120f8f"
@@ -20,15 +33,7 @@ let Namespace = {
 	jobs: [string]: types.#stanza.job
 }
 
-_defaultJobs: {
-	"leader-0":          #Jormungandr & {#role: "leader", #index:   0}
-	"leader-1":          #Jormungandr & {#role: "leader", #index:   1}
-	"leader-2":          #Jormungandr & {#role: "leader", #index:   2}
-	"follower-0":        #Jormungandr & {#role: "follower", #index: 0}
-	"servicing-station": #ServicingStation
-}
-
-#namespaces: [Name=_]: Namespace & {vars: namespace: Name}
+#namespaces: Namespace
 
 #namespaces: {
 	"catalyst-dryrun": {

diff --git a/jormungandr.cue b/jormungandr.cue
@@ -6,6 +6,7 @@ import (
 )
 
 #Jormungandr: types.#stanza.job & {
+	#block0: {url: string, checksum: string}
 	#role:              "leader" | "follower"
 	#index:             uint
 	#name:              "\(#role)-\(#index)"
@@ -188,7 +189,6 @@ import (
 				}
 			}
 
-			#block0: artifacts[namespace].block0
 			artifact: "local/block0.bin": {
 				source: #block0.url
 				options: {

diff --git a/overlay.nix b/overlay.nix
@@ -37,6 +37,12 @@ in {
     cue vet -c
   '';
 
+
+  buildJobFlakes = final.writeShellScriptBin "build_job_flakes.sh" ''
+    export PATH="$PATH:${lib.makeBinPath (with final; [ cue jq coreutils findutils ])}"
+    cue eval --out json -e flakes | jq -r '. | unique | sort | .[]' | xargs nix build
+  '';
+
   cue = final.callPackage ./pkgs/cue.nix { };
 
   debugUtils = with final; [

diff --git a/servicing-station.cue b/servicing-station.cue
@@ -5,6 +5,8 @@ import (
 )
 
 #ServicingStation: types.#stanza.job & {
+	#block0: {url: string, checksum: string}
+	#database: {url: string, checksum: string}
 	#vitOpsRev: string
 	#domain:    string
 
@@ -118,15 +120,13 @@ import (
           """
 			}
 
-			#block0: artifacts[namespace].block0
 			artifact: "local/block0.bin": {
 				source: #block0.url
 				options: {
 					checksum: #block0.checksum
 				}
 			}
 
-			#database: artifacts[namespace].database
 			artifact: "local/database.sqlite3": {
 				source: #database.url
 				options: {