From 15dec4256d30862567c8de5f459b1491a482a6a8 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Sat, 10 Feb 2024 20:05:20 +0000 Subject: [PATCH] site: upgrade to use testscript v1.11.0 We set Preprocessor-No-Write-Cache in order to cut out all the noise from gen_cache.cue invalidations. Preprocessor-No-Write-Cache: true Signed-off-by: Paul Jolly Change-Id: If65c23e855d6c5eb92a437538d21b2f942fe10b2 Dispatch-Trailer: {"type":"trybot","CL":1176667,"patchset":2,"ref":"refs/changes/67/1176667/2","targetBranch":"alpha"} --- internal/cmd/preprocessor/cmd/_docker/Dockerfile | 2 +- internal/cmd/preprocessor/cmd/gen_dockerimagetag.go | 2 +- .../cmd/testdata/execute_multistagescript.txtar | 8 ++++---- site.cue | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/cmd/preprocessor/cmd/_docker/Dockerfile b/internal/cmd/preprocessor/cmd/_docker/Dockerfile index 96b074eee9..8eca7bfe08 100644 --- a/internal/cmd/preprocessor/cmd/_docker/Dockerfile +++ b/internal/cmd/preprocessor/cmd/_docker/Dockerfile @@ -13,7 +13,7 @@ RUN \ --mount=type=cache,target=/cache/gocache \ --mount=type=cache,target=/cache/gomodcache \ export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache && \ - go install -trimpath github.com/rogpeppe/go-internal/cmd/testscript@v1.10.0 + go install -trimpath github.com/rogpeppe/go-internal/cmd/testscript@v1.11.0 RUN \ --mount=type=cache,target=/cache/gocache \ diff --git a/internal/cmd/preprocessor/cmd/gen_dockerimagetag.go b/internal/cmd/preprocessor/cmd/gen_dockerimagetag.go index cf75d85683..819656a35c 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:ae6419f80e5493d0bdac0f92a382f49c54f46d416baddba5f1c1fceb7d18e3fa" +const dockerImageTag = "preprocessor:d3f0435095fb485490797d77c09e75183266079906c1a4f80a69a3106ee2727e" diff --git a/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar b/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar index 5104aa21a6..d01ae85718 100644 --- a/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar +++ b/internal/cmd/preprocessor/cmd/testdata/execute_multistagescript.txtar @@ -215,12 +215,12 @@ package site page: { cache: { upload: { - "upload-some-cue": "t/8R3MZfp5S6nxeKI70M8H6MdN8p7cKi1oOW1voagYs=" - "upload-some-json": "mkNH3AVYAkyyKFxushsZAnGz7KDVdwl6hMrDwFfjPTk=" - "in-subdir": "B1oj6XGAl7FLEJOJCJXxlVOgSrdj0t3wbCXE69sjqd0=" + "upload-some-cue": "0eglyxDmF7Aa2cLdeejR7/RmnFeqdT8xc2BmJ1pXZ64=" + "upload-some-json": "3ASv2z3qO/8DOMBfc7bUL77Kqpbe8E5BV9or116S1yI=" + "in-subdir": "Zwiy4x77+BFu61goz1QtYAalWU2pz5BnNGntPD/6asM=" } multi_step: { - "GVBC7PRFLAQ3RF3LB8DNFP52PJ2IT78LNI417RMB57LF3K8P1C70====": [{ + "377NPLQLLSANR3SP4BDR88KQU32BUBAPDARQ3K4LHMK8MF2VI6F0====": [{ doc: """ # script doc comment #scripttag diff --git a/site.cue b/site.cue index 130e6d86b1..b77345401c 100644 --- a/site.cue +++ b/site.cue @@ -12,7 +12,7 @@ versions: { go: "go1.22.0" bareGoVersion: strings.TrimPrefix(go, "go") cue: "v0.8.0-0.dev.0.20240210175433-b460e71a6f24" - testscript: "v1.10.0" + testscript: "v1.11.0" } // _contentDefaults is a recursive template for setting defaults