Skip to content

Commit

Permalink
site: upgrade CUE tip to actual tip
Browse files Browse the repository at this point in the history
This changes the site's idea of what CUE version "tip" is, in order to
permit later CLs to access the as-yet-unreleased "matchN()" built-in
function.

Steps:
- discover pseudo-version with "go get cuelang.org/go@master"
- update site.cue:versions.cue.tip.v with the pseudo-version
- go generate ./...
- _scripts/buildDockerImage.bash
- CUE_UPDATE=1 go test -run TestScripts/execute_multistagescript ./internal/cmd/preprocessor/cmd

Preprocessor-No-Write-Cache: true
Signed-off-by: Jonathan Matthews <[email protected]>
Change-Id: I70051cd257815b48457eb9f85ae6b2eed9115e35
Dispatch-Trailer: {"type":"trybot","CL":1199794,"patchset":3,"ref":"refs/changes/94/1199794/3","targetBranch":"master"}
  • Loading branch information
jpluscplusm authored and cueckoo committed Aug 23, 2024
1 parent b24925a commit 6b4a1ce
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
9 changes: 8 additions & 1 deletion internal/cmd/preprocessor/cmd/_docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ RUN \
export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache && \
GOBIN=/cues/v0.10.0 go install -trimpath cuelang.org/go/cmd/[email protected]

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-0.dev.0.20240823082259-4967eb4077a9 go install -trimpath cuelang.org/go/cmd/[email protected]

RUN git clone https://github.com/cue-lang/libcue.git /libcue
RUN git -C /libcue reset --hard 1c861cc9cdc5584f5d26b0a7112aa2afee74d4cf
RUN CGO_ENABLED=1 go build -C /libcue -o libcue.so -buildmode=c-shared
Expand All @@ -42,7 +48,7 @@ ENV PATH="/cues/v0.10.0:${PATH}"
ENV PATH="/go/bin:/usr/local/go/bin:${PATH}"
ENV CUELANG_CUE_LATEST="v0.10.0"
ENV CUELANG_CUE_PRERELEASE="v0.10.0"
ENV CUELANG_CUE_TIP="v0.10.0"
ENV CUELANG_CUE_TIP="v0.11.0-0.dev.0.20240823082259-4967eb4077a9"
ENV CUELANG_CUE_DEFAULT="v0.10.0"
ENV CUELANG_CUE_PLAYGROUND="v0.10.0"

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

COPY --from=build /go/bin/testscript /go/bin
COPY --from=build /cues/v0.10.0/cue /cues/v0.10.0/cue
COPY --from=build /cues/v0.11.0-0.dev.0.20240823082259-4967eb4077a9/cue /cues/v0.11.0-0.dev.0.20240823082259-4967eb4077a9/cue

COPY --from=build /libcue/libcue.so /usr/local/lib/
ENV LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
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 @@ -292,12 +292,12 @@ package site
page: {
cache: {
upload: {
"hidden file": "JWWWKjmADBWhl0QTi2EXYyNoT6dmTInH9S/gefq7a1U="
"upload-some-cue": "Fr3Tpg9kMf0p0gcRYpD/X13z7LWqgi/BHvsA593+ThQ="
"in-subdir": "arS5H4yIQ3/tKAdS5kNY2MsLXcsl/HziAEXeTxkLuCk="
"hidden file": "pub0jNrThFzLkLkf2ZL3Ih1zHGiJ0BCiQ4txqL+x6Js="
"upload-some-cue": "1C2uPIQfDVt8f4wgQMCQK05nxc1jGsuD6dnsxSgviG0="
"in-subdir": "RjxKnwWRmkKggjG62K/I+UDHor6JFs7xBQ/8a85M8fQ="
}
multi_step: {
hash: "HR6FME1O2KPP0KP6EMFS4B4THNMQQTE3K1RKNJMTLBAGV36LNL90===="
hash: "SKLVP0SG20ULL0N373S1KMM9GHRIH2J232IPITFLHBTMHPLT7AG0===="
scriptHash: "RTE18RDQ3BFG4B5U2VR92496OPO5NOT61C424QBCDDT1RAAGPOUG===="
steps: [{
doc: ""
Expand Down
2 changes: 1 addition & 1 deletion site.cue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ versions: {
majorDotMinor: strings.Join(list.Take(strings.Split(v, "."), 2), ".")
}
prerelease: v: latest.v
tip: v: prerelease.v
tip: v: "v0.11.0-0.dev.0.20240823082259-4967eb4077a9"
default: v: latest.v
playground: v: latest.v
}
Expand Down

0 comments on commit 6b4a1ce

Please sign in to comment.