From 898b0816be4664495b1c885173549c982c5c7f12 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 25 Jun 2021 16:13:11 +0200 Subject: [PATCH 1/3] universe: add cue.mod Signed-off-by: Andrea Luzzardi --- cue.mod/pkg/alpha.dagger.io | 1 - stdlib/cue.mod/module.cue | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 cue.mod/pkg/alpha.dagger.io create mode 100644 stdlib/cue.mod/module.cue diff --git a/cue.mod/pkg/alpha.dagger.io b/cue.mod/pkg/alpha.dagger.io deleted file mode 120000 index 40a3fd9f..00000000 --- a/cue.mod/pkg/alpha.dagger.io +++ /dev/null @@ -1 +0,0 @@ -../../stdlib \ No newline at end of file diff --git a/stdlib/cue.mod/module.cue b/stdlib/cue.mod/module.cue new file mode 100644 index 00000000..45cdb689 --- /dev/null +++ b/stdlib/cue.mod/module.cue @@ -0,0 +1 @@ +module: "alpha.dagger.io" From ecb53566e6e5ccb99bc9b67ebf53cfeb993b40f5 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 25 Jun 2021 16:21:42 +0200 Subject: [PATCH 2/3] cmd doc: skip cue.mod Signed-off-by: Andrea Luzzardi --- cmd/dagger/cmd/doc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/dagger/cmd/doc.go b/cmd/dagger/cmd/doc.go index 33458255..c6c1eda6 100644 --- a/cmd/dagger/cmd/doc.go +++ b/cmd/dagger/cmd/doc.go @@ -333,7 +333,7 @@ func walkStdlib(ctx context.Context, output, format string) { if err != nil { return err } - if p == "." || !d.IsDir() { + if p == "." || !d.IsDir() || d.Name() == "cue.mod" { return nil } From 459627694469383246f0c777fce1fef436597e6e Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 25 Jun 2021 16:36:49 +0200 Subject: [PATCH 3/3] tests: sanity-check: run from universe directory Signed-off-by: Andrea Luzzardi --- stdlib/.dagger/env/sanity-check/plan/main.cue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stdlib/.dagger/env/sanity-check/plan/main.cue b/stdlib/.dagger/env/sanity-check/plan/main.cue index cf0de8ba..5d981a78 100644 --- a/stdlib/.dagger/env/sanity-check/plan/main.cue +++ b/stdlib/.dagger/env/sanity-check/plan/main.cue @@ -13,12 +13,12 @@ err: "" universe: dagger.#Input & dagger.#Artifact ctr: #CueCLI & { - vendor: "alpha.dagger.io": universe + ctx: universe command: """ ( find . -name '*.cue' -print0 | xargs -0iX dirname X | sort -u | { - while read -r dir; do + [ "$(basename $dir)" = "cue.mod" ] && continue echo "--- $dir" cue eval "$dir" >/dev/null done @@ -39,6 +39,7 @@ err: (os.#File & { #CueCLI: { command: string + ctx: dagger.#Artifact vendor: [name=string]: dagger.#Artifact ctr: os.#Container & { @@ -58,6 +59,7 @@ err: (os.#File & { rm -fr ./* """, ] + mount: "/ctx": from: ctx for name, dir in vendor { mount: "/ctx/cue.mod/pkg/\(name)": from: dir }