From 876d478caa6758e56f4aa1d525fc74fb087fc09d Mon Sep 17 00:00:00 2001 From: Kelton Bassingthwaite Date: Wed, 30 Mar 2022 08:08:15 -0700 Subject: [PATCH 1/3] Changed test name due to conflict with bash tests. Signed-off-by: Kelton Bassingthwaite --- pkg/universe.dagger.io/go/test/test.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/universe.dagger.io/go/test/test.bats b/pkg/universe.dagger.io/go/test/test.bats index fcefcd44..d3b47565 100644 --- a/pkg/universe.dagger.io/go/test/test.bats +++ b/pkg/universe.dagger.io/go/test/test.bats @@ -4,7 +4,7 @@ setup() { common_setup } -@test "bash" { +@test "go" { dagger "do" -p ./build.cue test dagger "do" -p ./container.cue test dagger "do" -p ./image.cue test From ef87a79588d9b81fc653bd62bd1e05c5bef7fcb8 Mon Sep 17 00:00:00 2001 From: Kelton Bassingthwaite Date: Wed, 30 Mar 2022 08:24:32 -0700 Subject: [PATCH 2/3] Hid DefaultVersion definition. Also updated to default version to go 1.18. Signed-off-by: Kelton Bassingthwaite --- pkg/universe.dagger.io/go/image.cue | 4 ++-- pkg/universe.dagger.io/go/test/image.cue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/universe.dagger.io/go/image.cue b/pkg/universe.dagger.io/go/image.cue index 9edbd2da..77794b3e 100644 --- a/pkg/universe.dagger.io/go/image.cue +++ b/pkg/universe.dagger.io/go/image.cue @@ -5,11 +5,11 @@ import ( ) // Go image default version -#DefaultVersion: "1.16" +#_DefaultVersion: "1.18" // Build a go base image #Image: { - version: *#DefaultVersion | string + version: *#_DefaultVersion | string packages: [pkgName=string]: version: string | *"" diff --git a/pkg/universe.dagger.io/go/test/image.cue b/pkg/universe.dagger.io/go/test/image.cue index 4a72a987..0aab3182 100644 --- a/pkg/universe.dagger.io/go/test/image.cue +++ b/pkg/universe.dagger.io/go/test/image.cue @@ -18,7 +18,7 @@ dagger.#Plan & { command: { name: "/bin/sh" args: ["-c", """ - go version | grep "1.16" + go version | grep "1.18" """] } } From 755c1b4962fb17213aea3825991178e915a3b6da Mon Sep 17 00:00:00 2001 From: Kelton Bassingthwaite Date: Wed, 30 Mar 2022 10:47:57 -0700 Subject: [PATCH 3/3] Changed underscore position in hidden definition. Signed-off-by: Kelton Bassingthwaite --- pkg/universe.dagger.io/go/image.cue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/universe.dagger.io/go/image.cue b/pkg/universe.dagger.io/go/image.cue index 77794b3e..4056dc47 100644 --- a/pkg/universe.dagger.io/go/image.cue +++ b/pkg/universe.dagger.io/go/image.cue @@ -5,11 +5,11 @@ import ( ) // Go image default version -#_DefaultVersion: "1.18" +_#DefaultVersion: "1.18" // Build a go base image #Image: { - version: *#_DefaultVersion | string + version: *_#DefaultVersion | string packages: [pkgName=string]: version: string | *""