diff --git a/internal/cmd/preprocessor/cmd/_docker/Dockerfile b/internal/cmd/preprocessor/cmd/_docker/Dockerfile index 351906888..3341abd99 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.20240902110846-1440b9eae7fa go install -trimpath cuelang.org/go/cmd/cue@v0.11.0-0.dev.0.20240902110846-1440b9eae7fa + 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.20240902110846-1440b9eae7fa" 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.20240902110846-1440b9eae7fa/cue /cues/v0.11.0-0.dev.0.20240902110846-1440b9eae7fa/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..48e6153e9 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:a4e25c724544d3981900fe2cc3037a0caa75197c8bf06f75262d24530f934e62" diff --git a/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar b/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar index a4c915986..a02382978 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": "bMEf7KCyPXbn8Vh0KllCFIVHWU3N4Jz9jzJxSo/YlH0=" + "upload-some-cue": "lPXlgBH2+9YAe7FEtouzLIi0u76aUeqXoRxFUxOFZhU=" + "in-subdir": "+BBWqSuISFRfVrfXOQ0iqQ6bs76rhKhfjjtl7iFuAOM=" } multi_step: { - hash: "HR6FME1O2KPP0KP6EMFS4B4THNMQQTE3K1RKNJMTLBAGV36LNL90====" + hash: "TKODUI1H6HRTHTM7MF1KQFKL943LCPJDBV7OKU1KCVF3VFKP31B0====" scriptHash: "RTE18RDQ3BFG4B5U2VR92496OPO5NOT61C424QBCDDT1RAAGPOUG====" steps: [{ doc: "" diff --git a/site.cue b/site.cue index 4cfec59ef..858cc799a 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.20240902110846-1440b9eae7fa" default: v: latest.v playground: v: latest.v }