Skip to content

Commit

Permalink
site: upgrade to v0.11.1 of CUE
Browse files Browse the repository at this point in the history
Simply bump the default version in site.cue then run
_scripts/regenPostInfraChange.bash.

Preprocessor-No-Write-Cache: true
Signed-off-by: Paul Jolly <[email protected]>
Change-Id: Ic8fcb38b746d019f1cc427262904d67216114790
  • Loading branch information
myitcv committed Dec 19, 2024
1 parent 3860c64 commit d5a3230
Show file tree
Hide file tree
Showing 24 changed files with 57 additions and 57 deletions.
12 changes: 6 additions & 6 deletions hugo/content/en/docs/concept/how-cue-works-with-go/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ func main() {

Before running, we add a dependency on the `cuelang.org/go` module and tidy:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down Expand Up @@ -236,8 +236,8 @@ age: 99
We finish by adding a dependency on the `cuelang.org/go` module, tidying,
and running the program:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHkKZ28gcnVuIC4=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHkKZ28gcnVuIC4=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down Expand Up @@ -310,8 +310,8 @@ func main() {

This time we see that CUE correctly caught a problem in our data:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHkKZ28gcnVuIC4=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHkKZ28gcnVuIC4=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ func main() {

We fetch the latest version of CUE, and tidy our Go module:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This guide demonstrates the following version:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down
4 changes: 2 additions & 2 deletions hugo/content/en/docs/howto/handle-errors-go-api/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ func main() {
{{< step stepNumber="6" >}}
Add a dependency on `cuelang.org/go` and ensure the Go module is tidy:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
4 changes: 2 additions & 2 deletions hugo/content/en/docs/howto/place-data-go-api/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ func main() {
{{< step stepNumber="5" >}}
Add a dependency on `cuelang.org/go` and ensure the Go module is tidy:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version of the `cue` command:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ version of the `cue` command:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down
4 changes: 2 additions & 2 deletions hugo/content/en/docs/howto/validate-go-cuego/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ and prints the validation result for each instance.
{{< step stepNumber="3" >}}
Add a dependency on `cuelang.org/go` and ensure the Go module is tidy:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ single JSON file, printing the validation result to its standard output stream.

{{< step stepNumber="6" >}}
Add a dependency on `cuelang.org/go` and ensure the Go module is tidy:
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
4 changes: 2 additions & 2 deletions hugo/content/en/docs/howto/walk-schemas-using-go-api/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ func structToType(name cue.Selector, val cue.Value) {
{{< step stepNumber="6" >}}
Add a dependency on `cuelang.org/go` and ensure the Go module is tidy:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
2 changes: 1 addition & 1 deletion hugo/content/en/docs/introduction/installation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The latest version of the `cue` command is:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This tutorial is written using the following version of `cue`:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down
6 changes: 3 additions & 3 deletions hugo/content/en/docs/tutorial/loading-cue-go-api/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ This tutorial is written using the following versions of `go` and `cue`:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24KZ28gdmVyc2lvbg==" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
$ go version
go version go1.23.2 linux/amd64
Expand Down Expand Up @@ -128,8 +128,8 @@ func main() {
{{< step stepNumber="6" >}}
Add a dependency on `cuelang.org/go` and ensure the Go module is tidy:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ This tutorial is written using the following version of `cue`:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down Expand Up @@ -260,7 +260,7 @@ We can see that the dependencies have now been added to the
$ cat cue.mod/module.cue
module: "github.com/cueckoo/frostyapp@v0"
language: {
version: "v0.11.0"
version: "v0.11.1"
}
source: {
kind: "git"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This tutorial uses the following version of CUE:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down Expand Up @@ -192,8 +192,8 @@ and then prints a message based on the `config` field.
{{< step stepNumber="8" >}}
Add a dependency on `cuelang.org/go` and ensure the Go module is tidy:

```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjAKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].0
```text { title="TERMINAL" type="terminal" codeToCopy="Z28gZ2V0IGN1ZWxhbmcub3JnL2dvQHYwLjExLjEKZ28gbW9kIHRpZHk=" }
$ go get cuelang.org/[email protected].1
...
$ go mod tidy
...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ This tutorial is written using the following version of `cmd/cue`:

```text { title="TERMINAL" type="terminal" codeToCopy="Y3VlIHZlcnNpb24=" }
$ cue version
cue version v0.11.0
cue version v0.11.1
...
```

Expand Down Expand Up @@ -296,7 +296,7 @@ We can see that the dependencies have now been added to the
$ cat cue.mod/module.cue
module: "glacial-tech.example/frostyapp@v0"
language: {
version: "v0.11.0"
version: "v0.11.1"
}
source: {
kind: "git"
Expand Down Expand Up @@ -446,7 +446,7 @@ Here is what the `cue.mod/module.cue` file now looks like:
$ cat cue.mod/module.cue
module: "glacial-tech.example/frostyapp@v0"
language: {
version: "v0.11.0"
version: "v0.11.1"
}
source: {
kind: "git"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ We can see that the dependencies have now been added to the `cue.mod/module.cue`
$ cat cue.mod/module.cue
module: "glacial-tech.example/frostyapp@v0"
language: {
version: "v0.11.0"
version: "v0.11.1"
}
deps: {
"github.com/cue-labs/examples/frostyconfig@v0": {
Expand Down
16 changes: 8 additions & 8 deletions internal/cmd/preprocessor/cmd/_docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN \
--mount=type=cache,target=/cache/gocache \
--mount=type=cache,target=/cache/gomodcache \
export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache && \
GOBIN=/cues/v0.11.0 go install -trimpath cuelang.org/go/cmd/[email protected].0
GOBIN=/cues/v0.11.1 go install -trimpath cuelang.org/go/cmd/[email protected].1

RUN git clone https://github.com/cue-lang/libcue.git /libcue
RUN git -C /libcue reset --hard 1c861cc9cdc5584f5d26b0a7112aa2afee74d4cf
Expand All @@ -44,14 +44,14 @@ ENV LC_ALL=C.UTF-8

# Default to the default value of CUE. Guides can fix to a different
# version explicitly
ENV PATH="/cues/v0.11.0:${PATH}"
ENV PATH="/cues/v0.11.1:${PATH}"

ENV PATH="/go/bin:/usr/local/go/bin:${PATH}"
ENV CUELANG_CUE_LATEST="v0.11.0"
ENV CUELANG_CUE_PRERELEASE="v0.11.0"
ENV CUELANG_CUE_TIP="v0.11.0"
ENV CUELANG_CUE_DEFAULT="v0.11.0"
ENV CUELANG_CUE_PLAYGROUND="v0.11.0"
ENV CUELANG_CUE_LATEST="v0.11.1"
ENV CUELANG_CUE_PRERELEASE="v0.11.1"
ENV CUELANG_CUE_TIP="v0.11.1"
ENV CUELANG_CUE_DEFAULT="v0.11.1"
ENV CUELANG_CUE_PLAYGROUND="v0.11.1"

WORKDIR /

Expand All @@ -64,7 +64,7 @@ RUN chmod 755 /usr/bin/entrypoint.sh
RUN chown root:root /usr/bin/entrypoint.sh

COPY --from=build /go/bin/testscript /go/bin
COPY --from=build /cues/v0.11.0/cue /cues/v0.11.0/cue
COPY --from=build /cues/v0.11.1/cue /cues/v0.11.1/cue

COPY --from=build /libcue/libcue.so /usr/local/lib/
ENV LD_LIBRARY_PATH="/usr/local/lib"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/preprocessor/cmd/gen_dockerimagetag.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ hello
```text { title="TERMINAL" type="terminal" codeToCopy="ZXhwb3J0IE1ZVkFSPXZhbHVlCmN1ZSB2ZXJzaW9u" }
$ export MYVAR=value
$ cue version
cue version v0.11.0
cue version v0.11.1

go version go1.23.2
-buildmode exe
Expand All @@ -264,7 +264,7 @@ go version go1.23.2
CGO_ENABLED 0
GOARCH amd64
GOOS linux
cue.lang.version v0.11.0
cue.lang.version v0.11.1
```
```text { title="TERMINAL" type="terminal" codeToCopy="bm9uZXhpc3RlbnQgY29tbWFuZA==" }
$ nonexistent command
Expand All @@ -283,12 +283,12 @@ package site
page: {
cache: {
upload: {
"hidden file": "8Gw9RATA7Z8qg94hzRDMSfMHg0QyfcfoCDIi568cbvo="
"upload-some-cue": "Qi6/hAlPrh2bY9UQD2CLMlZB3ku1oOrkRfdrwHyYtRk="
"in-subdir": "0qJmh3aq7QZU2/HOLE30MQebvDJcPzZbV6DUBf0kyNM="
"hidden file": "KEnW2F+GhYOAE2Wu5fds0AK0LlmMqsPX0TZS6UeY3sU="
"upload-some-cue": "fy/F9pB3dysxXK2LR4WIEpi4iG0v97KwmNVKOaMcgL8="
"in-subdir": "Sbe5NNz5Y/1lz7INEoPtcwiOpvjWaykbzdtdALi7ZRk="
}
multi_step: {
hash: "VIP77P8O62HK9CELKATL279BJ4GLEA4IBHAA10DCIR66FIDSENO0===="
hash: "0C9BQ1RG925DRRNO3ORPNGA94BKBLGQPFHQPLUEVBJ4NF5DGDDMG===="
scriptHash: "4R7CKCD6U3F6M7HMDOORM6L5LARG5T2HN3S7TGFFUFAJ61CAS8LG===="
steps: [{
doc: ""
Expand Down Expand Up @@ -350,7 +350,7 @@ package site
cmd: "cue version"
exitCode: 0
output: """
cue version v0.11.0
cue version v0.11.1

go version go1.23.2
-buildmode exe
Expand All @@ -360,7 +360,7 @@ package site
CGO_ENABLED 0
GOARCH amd64
GOOS linux
cue.lang.version v0.11.0
cue.lang.version v0.11.1

"""
}, {
Expand Down
2 changes: 1 addition & 1 deletion playground/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/cue-lang/cuelang.org/playground
go 1.23

require (
cuelang.org/go v0.11.0
cuelang.org/go v0.11.1
github.com/cockroachdb/apd/v3 v3.2.1
golang.org/x/text v0.19.0
gopkg.in/yaml.v3 v3.0.1
Expand Down
4 changes: 2 additions & 2 deletions playground/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cuelabs.dev/go/oci/ociregistry v0.0.0-20240906074133-82eb438dd565 h1:R5wwEcbEZSBmeyg91MJZTxfd7WpBo2jPof3AYjRbxwY=
cuelabs.dev/go/oci/ociregistry v0.0.0-20240906074133-82eb438dd565/go.mod h1:5A4xfTzHTXfeVJBU6RAUf+QrlfTCW+017q/QiW+sMLg=
cuelang.org/go v0.11.0 h1:2af2nhipqlUHtXk2dtOP5xnMm1ObGvKqIsJUJL1sRE4=
cuelang.org/go v0.11.0/go.mod h1:PBY6XvPUswPPJ2inpvUozP9mebDVTXaeehQikhZPBz0=
cuelang.org/go v0.11.1 h1:pV+49MX1mmvDm8Qh3Za3M786cty8VKPWzQ1Ho4gZRP0=
cuelang.org/go v0.11.1/go.mod h1:PBY6XvPUswPPJ2inpvUozP9mebDVTXaeehQikhZPBz0=
github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg=
github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down
2 changes: 1 addition & 1 deletion playground/src/config/gen_cuelang_org_go_version.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Code generated site_tool.cue; DO NOT EDIT.

export const CUEVersion = 'v0.11.0';
export const CUEVersion = 'v0.11.1';
2 changes: 1 addition & 1 deletion site.cue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ versions: {
cue: {
[x=string]: var: "CUELANG_CUE_\(strings.ToUpper(x))"
latest: {
v: *"v0.11.0" | _
v: *"v0.11.1" | _
majorDotMinor: strings.Join(list.Take(strings.Split(v, "."), 2), ".")
}
prerelease: v: *latest.v | _
Expand Down

0 comments on commit d5a3230

Please sign in to comment.