Skip to content

Commit

Permalink
site: upgrade to v0.8.0
Browse files Browse the repository at this point in the history
Verified the commit is complete locally with:

    go generate ./...
    ./_scripts/buildDockerImage.bash
    CUE_UPDATE=1 go test -run TestScripts/execute_multistagescript ./internal/cmd/preprocessor/cmd
    go test ./...
    ./_scripts/runPreprocessor.bash execute --update

We set Preprocessor-No-Write-Cache in order that we don't lose real
diffs in a sea of gen_cache.cue updates.

Preprocessor-No-Write-Cache: true
Signed-off-by: Paul Jolly <paul@myitcv.io>
Change-Id: I4f0b218748aa060b661aada7056c1fdd2feb79cc
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cuelang.org/+/1183481
TryBot-Result: CUEcueckoo <cueckoo@gmail.com>
Reviewed-by: Jonathan Matthews <github@hello.jonathanmatthews.com>
  • Loading branch information
myitcv committed Mar 16, 2024
1 parent e57cd0e commit 80c17ba
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 37 deletions.
2 changes: 1 addition & 1 deletion hugo/config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ logo = "svg/logo-alpha.svg"
type = 'test'

# TODO: move away from defaulting to the pre-release of CUE
content = '**Note:** documentation on this site relies on CUE v0.8.0-rc.1'
content = '**Note:** documentation on this site relies on CUE v0.8.0'
[notification.button]
link = 'https://github.com/cue-lang/cue/releases'
icon = 'download'
Expand Down
36 changes: 22 additions & 14 deletions hugo/content/en/docs/reference/cli/cue-environment/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ The cue command consults environment variables for configuration.
If an environment variable is unset or empty, it uses a sensible default
setting.
CUE_CONFIG_DIR
The directory where the cue command keeps configuration and
state files. This defaults to a directory for user-specific
configuration data, such as:
"$XDG_CONFIG_HOME/cue" or "$HOME/.config/cue" on Linux
"$HOME/Library/Application Support/cue" on MacOS
"%AppData%/cue" on Windows
CUE_CACHE_DIR
The directory where the cue command keeps a cache of files to be
reused. This defaults to a directory for user-specific temporary
Expand All @@ -29,14 +20,25 @@ setting.
"$HOME/Library/Caches/cue" on MacOS
"%LocalAppData%/cue" on Windows
CUE_REGISTRY
CUE_CONFIG_DIR
The directory where the cue command keeps configuration and
state files. This defaults to a directory for user-specific
configuration data, such as:
This variable specifies which registry or registries to use for
downloading and publishing modules. See "cue help registryconfig"
for details.
"$XDG_CONFIG_HOME/cue" or "$HOME/.config/cue" on Linux
"$HOME/Library/Application Support/cue" on MacOS
"%AppData%/cue" on Windows
CUE_DEBUG
Comma-separated list of debug flags to enable. Current possible
values are:
http
Print log messages in JSON format, one per line showing
HTTP requests and responses made when interacting with
module registries.
CUE_EXPERIMENT
Comma-separated list of experiments to enable or disable. The
Comma-separated list of experiments to enable. The
list of available experiments may change arbitrarily over time.
See exp.go in package cuelang.org/go/internal/cueexperiment for
currently valid values.
Expand All @@ -45,4 +47,10 @@ setting.
testing of the cue commands itself. Use beyond that purpose is
unsupported.
CUE_REGISTRY
This variable specifies which registry or registries to use for
downloading and publishing modules. See "cue help registryconfig"
for details.
```
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ definition:
//
// If there are multiple matching prefixes, the longest
// is chosen.
moduleRegistries: [#modulePath]: #registry
moduleRegistries?: [#modulePath]: #registry
// defaultRegistry specifies a fallback registry to be used if no
// prefix from moduleRegistry matches.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ This tutorial is written using the following version of `cmd/cue`:

```text { title="TERMINAL" codeToCopy="Y3VlIHZlcnNpb24K" }
$ cue version
cue version v0.8.0-rc.1
cue version v0.8.0
...
```

Expand Down Expand Up @@ -279,7 +279,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.8.0-rc.1"
version: "v0.8.0"
}
deps: {
"glacial-tech.example/frostyconfig@v0": {
Expand Down Expand Up @@ -412,7 +412,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.8.0-rc.1"
version: "v0.8.0"
}
deps: {
"glacial-tech.example/frostyconfig@v0": {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/preprocessor/cmd/_docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ RUN \
--mount=type=cache,target=/cache/gocache \
--mount=type=cache,target=/cache/gomodcache \
export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache && \
GOBIN=/cues/latest go install -trimpath cuelang.org/go/cmd/cue@v0.7.1
GOBIN=/cues/latest go install -trimpath cuelang.org/go/cmd/cue@v0.8.0

RUN \
--mount=type=cache,target=/cache/gocache \
--mount=type=cache,target=/cache/gomodcache \
export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache && \
GOBIN=/cues/prerelease go install -trimpath cuelang.org/go/cmd/cue@v0.8.0-rc.1
GOBIN=/cues/prerelease go install -trimpath cuelang.org/go/cmd/cue@v0.8.0

RUN \
--mount=type=cache,target=/cache/gocache \
--mount=type=cache,target=/cache/gomodcache \
export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache && \
GOBIN=/cues/tip go install -trimpath cuelang.org/go/cmd/cue@v0.8.0-rc.1
GOBIN=/cues/tip go install -trimpath cuelang.org/go/cmd/cue@v0.8.0

FROM golang:1.22.1

Expand All @@ -43,9 +43,9 @@ RUN mkdir -p /go/bin
ENV PATH="/cues/prerelease:${PATH}"

ENV PATH="/go/bin:/usr/local/go/bin:${PATH}"
ENV CUELANG_CUE_LATEST="v0.7.1"
ENV CUELANG_CUE_PRERELEASE="v0.8.0-rc.1"
ENV CUELANG_CUE_TIP="v0.8.0-rc.1"
ENV CUELANG_CUE_LATEST="v0.8.0"
ENV CUELANG_CUE_PRERELEASE="v0.8.0"
ENV CUELANG_CUE_TIP="v0.8.0"

WORKDIR /

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 @@ -217,7 +217,7 @@ hello
```text { title="TERMINAL" codeToCopy="ZXhwb3J0IE1ZVkFSPXZhbHVlCmN1ZSB2ZXJzaW9uCg==" }
$ export MYVAR=value
$ cue version
cue version v0.8.0-rc.1
cue version v0.8.0

go version go1.22.1
-buildmode exe
Expand Down Expand Up @@ -245,13 +245,13 @@ package site
page: {
cache: {
upload: {
"hidden file": "3NmIHsqAHwuFayRHzbw/31qx5PqGI7WN5aZAdr3OmGY="
"upload-some-cue": "qsEqG60bTVLYql5dZSnLy4FVIk8rPzqBohisJL9kV54="
"upload-some-json": "QbrSxyoKi/HCGFSijQZ9B925SaveNi+6VE1UDKPt8As="
"in-subdir": "SQItkwSe4DIysS578hzn+pC7gN0WWCMHJLr+UGaWSbI="
"hidden file": "OutM9DQ+VLJfo3gey6kvCY4hamW5VDhPbCK7eYcxW68="
"upload-some-cue": "RKWrdN8ZwaOGoxRY6wqyDaZixGAXxsQRQGaZ/rxLCn4="
"upload-some-json": "eYWe3RDFSuPWRAREhwmk2wGcbyMHfFvamGsCS8Fp6uc="
"in-subdir": "kJpfLfPSiM0gqwwAlOEl3ALOYE5ILM/rzXHIVJxR0CQ="
}
multi_step: {
"9E7QSLPBF921MGCCQL10IVR7NC6SPIJ2MNN8MUOH9U1GSUBQG5TG====": [{
"ST9O8G89I8DFPFJB4LK49BJVMK3F69MIDGMDDJO1V9CCLLBDQFE0====": [{
doc: """
# script doc comment
#scripttag
Expand Down Expand Up @@ -287,7 +287,7 @@ package site
cmd: "cue version"
exitCode: 0
output: """
cue version v0.8.0-rc.1
cue version v0.8.0

go version go1.22.1
-buildmode exe
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,4 +1,4 @@
// Code generated site_tool.cue; DO NOT EDIT.

// TODO: move away from defaulting to the pre-release of CUE
export const CUEVersion = 'v0.8.0-rc.1';
export const CUEVersion = 'v0.8.0';
6 changes: 3 additions & 3 deletions site.cue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ versions: {
go: "go1.22.1"
bareGoVersion: strings.TrimPrefix(go, "go")
cue: {
latest: "v0.7.1"
prerelease: "v0.8.0-rc.1"
tip: "v0.8.0-rc.1"
latest: "v0.8.0"
prerelease: "v0.8.0"
tip: "v0.8.0"
}
testscript: "v1.11.0"
}
Expand Down

0 comments on commit 80c17ba

Please # to comment.