update cue to v0.9.0 + bugfix commit

hofstadter-io · Jun 6, 2024 · b3797b9 · b3797b9
1 parent 5627a7e
commit b3797b9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/flow.cue b/flow.cue
@@ -50,6 +50,8 @@ _flow: {
 
 _cond: {
 	shouldi: yes: bool | *false
+	stdout: string
+	stderr: string
 	if _force || shouldi.yes {
 		@task(os.Exec)
 		if _print {
@@ -84,8 +86,6 @@ build: F= _flow & {
   docs: {
 		[string]: {
 			dir: "docs"
-			stdout: string
-			stderr: string
 			#after: { $cli: F.cli }
 			_cond
 		}
@@ -111,4 +111,17 @@ build: F= _flow & {
 			#after: { $gen: gen, $schemas: schemas }
 		}
   }
+}
+
+images: F=_flow & {
+	@flow(images)
+	_reg: "ghcr.io/hofstadter-io"
+	for _,tool in ["black", "csharpier", "prettier"] {
+		(tool): {
+			_cond
+			dir: "formatters/tools/\(tool)"
+			shouldi: F._shouldi & { globs: [dir] }
+			run: "docker build -t \(_reg)/\(tool):dirty -f Dockerfile.debian ."
+		}
+	}
 }
diff --git a/go.mod b/go.mod
@@ -4,10 +4,8 @@ go 1.21
 
 toolchain go1.21.4
 
-replace cuelang.org/go => ../cue
-
 require (
-	cuelang.org/go v0.9.0-rc.1
+	cuelang.org/go v0.9.1-0.20240606151748-e09cb310d52d
 	dagger.io/dagger v0.8.4
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/BurntSushi/toml v1.3.2

diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 cuelabs.dev/go/oci/ociregistry v0.0.0-20240412105620-eedc705cef15 h1:W1yhnRytFwrWARHmhvJDhn4hjx73Hb5sffPnn3109MI=
 cuelabs.dev/go/oci/ociregistry v0.0.0-20240412105620-eedc705cef15/go.mod h1:pK23AUVXuNzzTpfMCA06sxZGeVQ/75FdVtW249de9Uo=
+cuelang.org/go v0.9.1-0.20240606151748-e09cb310d52d h1:axoc9U6NgLzxUOLUYvYs9YqE9VwCWnSIl15Sfw6subE=
+cuelang.org/go v0.9.1-0.20240606151748-e09cb310d52d/go.mod h1:qpAYsLOf7gTM1YdEg6cxh553uZ4q9ZDWlPbtZr9q1Wk=
 dagger.io/dagger v0.8.4 h1:2zNu40cBvPZc/CSgMnLRfayfQj5VtbJlDtWJyWGwGSQ=
 dagger.io/dagger v0.8.4/go.mod h1:Nwl7WI8YETaZhGjPJvkiOZnKLJXBaJOkSarp5m4+FxA=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=