From ca4b3710173205a1aee0b55dcfd1d7f8dc4ace5d Mon Sep 17 00:00:00 2001 From: Jonathan Matthews Date: Wed, 21 Aug 2024 09:37:04 +0100 Subject: [PATCH] site: upgrade CUE tip to actual tip This changes the site's idea of what CUE version "tip" refers to. 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 Change-Id: I70051cd257815b48457eb9f85ae6b2eed9115e35 Dispatch-Trailer: {"type":"trybot","CL":1199794,"patchset":6,"ref":"refs/changes/94/1199794/6","targetBranch":"master"} --- internal/cmd/preprocessor/cmd/_docker/Dockerfile | 9 ++++++++- internal/cmd/preprocessor/cmd/gen_dockerimagetag.go | 2 +- .../cmd/testdata/execute_multistagescript.txtar | 8 ++++---- site.cue | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/internal/cmd/preprocessor/cmd/_docker/Dockerfile b/internal/cmd/preprocessor/cmd/_docker/Dockerfile index 351906888..0d61efc47 100644 --- a/internal/cmd/preprocessor/cmd/_docker/Dockerfile +++ b/internal/cmd/preprocessor/cmd/_docker/Dockerfile @@ -23,6 +23,12 @@ RUN \ export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache && \ GOBIN=/cues/v0.10.0 go install -trimpath cuelang.org/go/cmd/cue@v0.10.0 +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.20240904084811-bb24c7ce1f04 go install -trimpath cuelang.org/go/cmd/cue@v0.11.0-0.dev.0.20240904084811-bb24c7ce1f04 + 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 @@ -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.20240904084811-bb24c7ce1f04" ENV CUELANG_CUE_DEFAULT="v0.10.0" ENV CUELANG_CUE_PLAYGROUND="v0.10.0" @@ -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.20240904084811-bb24c7ce1f04/cue /cues/v0.11.0-0.dev.0.20240904084811-bb24c7ce1f04/cue COPY --from=build /libcue/libcue.so /usr/local/lib/ ENV LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}" diff --git a/internal/cmd/preprocessor/cmd/gen_dockerimagetag.go b/internal/cmd/preprocessor/cmd/gen_dockerimagetag.go index 5d56f149e..f0fa051e8 100644 --- a/internal/cmd/preprocessor/cmd/gen_dockerimagetag.go +++ b/internal/cmd/preprocessor/cmd/gen_dockerimagetag.go @@ -2,4 +2,4 @@ package cmd -const dockerImageTag = "preprocessor:5d9ff50143b8548c1f62d66fb5c6e4f2b1c7949855daae86b25ef180904476fe" +const dockerImageTag = "preprocessor:3f82fd701cd8dc5904d094746c0f6cc787b3aa1dfaf88a88854334653954d83d" diff --git a/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar b/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar index a4c915986..3d320db55 100644 --- a/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar +++ b/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar @@ -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": "i2pOE5L40CJ6XBvNiPJcr48sS/cTxkuo2a4hfoUCH7M=" + "upload-some-cue": "8Dmzfv0l+eGzOK9vsKJb0A3Az0MLce5z0/ypFanXeaI=" + "in-subdir": "ZnNeP9vRloNf4na3Z+GJDIKDBLvYp5k3AqOlN5U5e6M=" } multi_step: { - hash: "HR6FME1O2KPP0KP6EMFS4B4THNMQQTE3K1RKNJMTLBAGV36LNL90====" + hash: "FLNTHEQMAA44K194C0IE4IMSQQB4QMKJCUS3FFA3FTCBAPT08330====" scriptHash: "RTE18RDQ3BFG4B5U2VR92496OPO5NOT61C424QBCDDT1RAAGPOUG====" steps: [{ doc: "" diff --git a/site.cue b/site.cue index c7aa471d1..6d42df7a7 100644 --- a/site.cue +++ b/site.cue @@ -20,7 +20,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.20240904084811-bb24c7ce1f04" default: v: latest.v playground: v: latest.v }