From 3a7a21326a11442f7e87ecfada250900846281af Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Mon, 8 Mar 2021 10:03:16 -0500 Subject: [PATCH 1/3] fixes perf with dogfood Signed-off-by: Tony Worm --- stdlib/dagger/dagger.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/dagger/dagger.cue b/stdlib/dagger/dagger.cue index c11a7870..577b7c4c 100644 --- a/stdlib/dagger/dagger.cue +++ b/stdlib/dagger/dagger.cue @@ -18,7 +18,7 @@ package dagger #Local: { do: "local" dir: string - include: [...string] | *[] + include: [...string] } // FIXME: bring back load (more efficient than copy) From 0d3aace2b9527f45a62bf1753816d758a131eb34 Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Mon, 8 Mar 2021 11:05:13 -0500 Subject: [PATCH 2/3] test.sh: fix relpath to dagger, enable stdlib/{go,yarn} tests Signed-off-by: Tony Worm --- tests/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test.sh b/tests/test.sh index f6bf3b26..f9843843 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -7,7 +7,7 @@ readonly d=$(cd "$(dirname "${BASH_SOURCE[0]:-$PWD}")" 2>/dev/null 1>&2 && pwd) . "$d/test-lib.sh" # Point this to your dagger binary -readonly DAGGER_BINARY="${DAGGER_BINARY:-$d/../../cmd/dagger/dagger}" +readonly DAGGER_BINARY="${DAGGER_BINARY:-$d/../cmd/dagger/dagger}" # The default arguments are a no-op, but having "anything" is a little cheat necessary for "${DAGGER_BINARY_ARGS[@]}" to not be empty down there DAGGER_BINARY_ARGS="${DAGGER_BINARY_ARGS:---log-format json}" read -ra DAGGER_BINARY_ARGS <<< "${DAGGER_BINARY_ARGS:-}" @@ -25,9 +25,9 @@ test::stdlib() { test::one "stdlib: alpine" \ "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/stdlib/alpine - disable test::one "stdlib: yarn (FIXME: performance)" \ + test::one "stdlib: yarn" \ "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/stdlib/yarn --input-dir TestData="$d"/stdlib/yarn/testdata - disable test::one "stdlib: go (FIXME: performance)" \ + test::one "stdlib: go" \ "$dagger" "${DAGGER_BINARY_ARGS[@]}" compute "$d"/stdlib/go --input-dir TestData="$d"/stdlib/go/testdata } From 3e5df44a1d91849eb748a5e01198cbe4720518c6 Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Mon, 8 Mar 2021 11:11:29 -0500 Subject: [PATCH 3/3] cue/fmt: stdlib/dagger Signed-off-by: Tony Worm --- stdlib/dagger/dagger.cue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/dagger/dagger.cue b/stdlib/dagger/dagger.cue index 577b7c4c..f5a93cb2 100644 --- a/stdlib/dagger/dagger.cue +++ b/stdlib/dagger/dagger.cue @@ -16,8 +16,8 @@ package dagger } #Local: { - do: "local" - dir: string + do: "local" + dir: string include: [...string] }