hof/deps: update to CUE v0.6.0 (#254)

hofstadter-io · Aug 10, 2023 · 112659f · 112659f
1 parent dc17e65
commit 112659f
Show file tree

Hide file tree

Showing 25 changed files with 32 additions and 32 deletions.
diff --git a/ci/harmony/main.go b/ci/harmony/main.go
@@ -31,7 +31,7 @@ func init() {
 	}
 
 	pflag.StringVar(&R.HofVer, "hof", "local", "set Hof version")
-	pflag.StringVar(&R.CueVer, "cue", "v0.6.0-beta.1", "set CUE version")
+	pflag.StringVar(&R.CueVer, "cue", "v0.6.0", "set CUE version")
 	pflag.StringVar(&R.GoVer, "go", "1.20", "set Go version")
 	pflag.StringVar(&R.ContainerRuntime, "container-runtime", "docker", "set container runtime")
 	pflag.StringVar(&R.ContainerVersion, "container-version", "24", "set container version")

diff --git a/cmd/hof/verinfo/verinfo.go b/cmd/hof/verinfo/verinfo.go
@@ -15,7 +15,7 @@ var (
 	BuildArch = "Unknown"
 
 	// todo, look this up from deps
-	CueVersion = "0.6.0-rc.1"
+	CueVersion = "0.6.0"
 
 	// this is a version we can fetch with hof mod
 	// the value gets injected into templates in various places

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/hofstadter-io/hof
 go 1.19
 
 require (
-	cuelang.org/go v0.6.0-rc.1
+	cuelang.org/go v0.6.0
 	dagger.io/dagger v0.7.2
 	github.com/AlecAivazis/survey/v2 v2.3.6
 	github.com/BurntSushi/toml v1.2.1

diff --git a/go.sum b/go.sum
@@ -35,8 +35,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cuelang.org/go v0.6.0-rc.1 h1:GN9CDuogM15cbuEE/kkTsbup3PylOcz/18zHLwaEJI8=
-cuelang.org/go v0.6.0-rc.1/go.mod h1:9CxOX8aawrr3BgSdqPj7V0RYoXo7XIb+yDFC6uESrOQ=
+cuelang.org/go v0.6.0 h1:dJhgKCog+FEZt7OwAYV1R+o/RZPmE8aqFoptmxSWyr8=
+cuelang.org/go v0.6.0/go.mod h1:9CxOX8aawrr3BgSdqPj7V0RYoXo7XIb+yDFC6uESrOQ=
 dagger.io/dagger v0.7.2 h1:gs4z2nyFPy7U35KmCgr0sZapz7xI8n8cso71D0YHb9w=
 dagger.io/dagger v0.7.2/go.mod h1:TgNJZFyAh/fTRldRw1vrBKc4c5XfBtZ6i+kfg2C3BHY=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=

diff --git a/lib/mod/testdata/authd/apikeys/vendor__priv_bitbucket.txt b/lib/mod/testdata/authd/apikeys/vendor__priv_bitbucket.txt
@@ -3,7 +3,7 @@ exec hof mod vendor
 
 -- cue.mod/module.cue --
 module: "github.com/test/priv-bitbucket"
-cue: "0.6.0-beta.1"
+cue: "0.6.0"
 
 require: {
 	"bitbucket.org/hofstadter/hofmod-test-priv-bitbucket": "v0.0.2"

diff --git a/lib/mod/testdata/authd/apikeys/vendor__priv_github.txt b/lib/mod/testdata/authd/apikeys/vendor__priv_github.txt
@@ -4,7 +4,7 @@ exists cue.mod/pkg/github.com/hofstadter-io/hofmod-test-priv-github/cue.mod/modu
 
 -- cue.mod/module.cue --
 module: "github.com/test/priv-github"
-cue: "0.6.0-beta.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hofmod-test-priv-github": "v0.0.2"

diff --git a/lib/mod/testdata/authd/apikeys/vendor__priv_github_fail.txt b/lib/mod/testdata/authd/apikeys/vendor__priv_github_fail.txt
@@ -5,7 +5,7 @@ env GITHUB_TOKEN=thistokendoesnotexist
 
 -- cue.mod/module.cue --
 module: "github.com/test/priv-github"
-cue: "0.6.0-beta.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hofmod-test-priv-github": "v0.0.2"

diff --git a/lib/mod/testdata/authd/apikeys/vendor__priv_gitlab.txt b/lib/mod/testdata/authd/apikeys/vendor__priv_gitlab.txt
@@ -3,7 +3,7 @@ exec hof mod vendor
 
 -- cue.mod/module.cue --
 module: "github.com/test/priv-gitlab"
-cue: "0.6.0-beta.1"
+cue: "0.6.0"
 
 require: {
 	"gitlab.com/_hofstadter/hofmod-test-priv-gitlab": "v0.0.2"

diff --git a/lib/mod/testdata/authd/sshconfig/vendor__priv_github.txt b/lib/mod/testdata/authd/sshconfig/vendor__priv_github.txt
@@ -23,7 +23,7 @@ IdentityFile ~/.ssh/id_rsa_mycompanyaccount_gitlab
 
 -- cue.mod/module.cue --
 module: "github.com/test/priv-github"
-cue: "0.6.0-beta.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hofmod-test-priv-github": "v0.0.2"

diff --git a/lib/mod/testdata/authd/sshkey/vendor__priv_all.txt b/lib/mod/testdata/authd/sshkey/vendor__priv_all.txt
@@ -38,7 +38,7 @@ IdentityFile ~/.ssh/id_rsa
 
 -- cue.mod/module.cue --
 module: "github.com/test/priv-all"
-cue: "0.6.0-beta.1"
+cue: "0.6.0"
 
 require: {
     "bitbucket.org/hofstadter/hofmod-test-priv-bitbucket": "v0.0.2"

diff --git a/lib/mod/testdata/get__latest_dep.txt b/lib/mod/testdata/get__latest_dep.txt
@@ -11,10 +11,10 @@ cmp cue.mod/module.cue match/cue.mod/module-get.cue
 
 -- match/cue.mod/module-init.cue --
 module: "hof.io/test"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 -- match/cue.mod/module-get.cue --
 module: "hof.io/test"
-cue:    "0.6.0-rc.1"
+cue:    "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.5"

diff --git a/lib/mod/testdata/get__new_dep.txt b/lib/mod/testdata/get__new_dep.txt
@@ -6,10 +6,10 @@ cmp cue.mod/module.cue match/cue.mod/module-get.cue
 
 -- match/cue.mod/module-init.cue --
 module: "hof.io/test"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 -- match/cue.mod/module-get.cue --
 module: "hof.io/test"
-cue:    "0.6.0-rc.1"
+cue:    "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.5"

diff --git a/lib/mod/testdata/get__newer_dep.txt b/lib/mod/testdata/get__newer_dep.txt
@@ -5,14 +5,14 @@ cmp cue.mod/module.cue match/cue.mod/module-get.cue
 
 -- cue.mod/module.cue --
 module: "hof.io/test"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.3"
 }
 -- match/cue.mod/module-get.cue --
 module: "hof.io/test"
-cue:    "0.6.0-rc.1"
+cue:    "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.9"

diff --git a/lib/mod/testdata/get__same_dep.txt b/lib/mod/testdata/get__same_dep.txt
@@ -4,7 +4,7 @@ exec hof mod vendor
 
 -- cue.mod/module.cue --
 module: "hof.io/test"
-cue:    "0.6.0-rc.1"
+cue:    "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.3"

diff --git a/lib/mod/testdata/get__update_all_deps.txt b/lib/mod/testdata/get__update_all_deps.txt
@@ -3,7 +3,7 @@ cmp cue.mod/module.cue match/cue.mod/module-get.cue
 
 -- cue.mod/module.cue --
 module: "github.com/hof/test"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.13"
@@ -15,7 +15,7 @@ indirect: {
 }
 -- match/cue.mod/module-get.cue --
 module: "github.com/hof/test"
-cue:    "0.6.0-rc.1"
+cue:    "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.13"

diff --git a/lib/mod/testdata/get__update_dep.txt b/lib/mod/testdata/get__update_dep.txt
@@ -6,10 +6,10 @@ cmp cue.mod/module.cue match/cue.mod/module-get.cue
 
 -- match/cue.mod/module-init.cue --
 module: "hof.io/test"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 -- match/cue.mod/module-get.cue --
 module: "hof.io/test"
-cue:    "0.6.0-rc.1"
+cue:    "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.3"

diff --git a/lib/mod/testdata/init__module_initd.txt b/lib/mod/testdata/init__module_initd.txt
@@ -6,6 +6,6 @@ stdout 'CUE module already exists in this directory'
 -- cue.mod/module.cue --
 
 module: "hof.io/test"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 -- dummy-end --
diff --git a/lib/mod/testdata/init__new_module.txt b/lib/mod/testdata/init__new_module.txt
@@ -7,5 +7,5 @@ cmp cue.mod/module.cue match/cue.mod/module.cue
 
 -- match/cue.mod/module.cue --
 module: "github.com/test/mod"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 -- dummy_end --
diff --git a/lib/mod/testdata/noauth_deps.txt b/lib/mod/testdata/noauth_deps.txt
@@ -7,7 +7,7 @@ hof mod tidy
 
 -- cue.mod/module.cue --
 module: "github.com/hofstadter-io/hof-docs"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/cuelm": "v0.1.0"

diff --git a/lib/mod/testdata/tidy__simple.txt b/lib/mod/testdata/tidy__simple.txt
@@ -6,14 +6,14 @@ exists cue.mod/pkg/github.com/hofstadter-io/ghacue
 
 -- cue.mod/module.cue --
 module: "github.com/hof/test"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.5"
 }
 -- cue.mod/module.golden --
 module: "github.com/hof/test"
-cue:    "0.6.0-rc.1"
+cue:    "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.5"

diff --git a/lib/mod/testdata/vendor__local_replace_with_require.txt b/lib/mod/testdata/vendor__local_replace_with_require.txt
@@ -4,7 +4,7 @@ exec hof mod vendor
 
 -- cue.mod/module.cue --
 module: "github.com/test/mod"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.5"

diff --git a/lib/mod/testdata/vendor__mod_file_errs.txt b/lib/mod/testdata/vendor__mod_file_errs.txt
@@ -7,7 +7,7 @@ stdout 'Dependency "github.com/hofstadter-io/hof" required twice in ""'
 
 -- cue.mod/module.cue --
 module: "github.com/test/2x-req"
-cue "v0.4.3"
+cue "0.6.0"
 
 require: {
     "github.com/hofstadter-io/hof": "v0.0.0"

diff --git a/lib/mod/testdata/vendor__new_module.txt b/lib/mod/testdata/vendor__new_module.txt
@@ -9,7 +9,7 @@ cmp cue.mod/module.cue match/cue.mod/module.cue
 
 -- match/cue.mod/module.cue --
 module: "github.com/test/mod"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 -- dummy_end --
 
 
diff --git a/lib/mod/testdata/vendor__with_deps.txt b/lib/mod/testdata/vendor__with_deps.txt
@@ -4,7 +4,7 @@ exists cue.mod/pkg/github.com/hofstadter-io/hof/cue.mod/module.cue
 
 -- cue.mod/module.cue --
 module: "github.com/test/withsolo"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.6.8-beta.9"

diff --git a/lib/mod/testdata/vendor__with_psuedo.txt b/lib/mod/testdata/vendor__with_psuedo.txt
@@ -4,7 +4,7 @@ exists cue.mod/pkg/github.com/hofstadter-io/hof/cue.mod/module.cue
 
 -- cue.mod/module.cue --
 module: "github.com/test/withsolo"
-cue: "0.6.0-rc.1"
+cue: "0.6.0"
 
 require: {
 	"github.com/hofstadter-io/hof": "v0.0.0-20230309083347-a7d892fc4363e2b9d8ee41183fd12c32f71abf06"