From 2f70bd20d13ca699bf61cf2bb37881f029851275 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 7 Oct 2026 00:29:47 +0900 Subject: internal/workflows: fetch distribution artifact This is cleaner than contacting the cmd/mbf CI service on every run, although also slightly slower in some cases. Signed-off-by: Ophestra --- internal/workflows/test.go | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'internal/workflows/test.go') diff --git a/internal/workflows/test.go b/internal/workflows/test.go index 41ed05c5..1f9bba58 100644 --- a/internal/workflows/test.go +++ b/internal/workflows/test.go @@ -33,6 +33,7 @@ var _ = (&Workflow{ Name: "Sandbox", On: "rosa", + Needs: []string{"dist"}, Steps: []Step{ fixup, checkout, @@ -45,7 +46,7 @@ var _ = (&Workflow{ "pipewire", ), - newCIRequest("distribution", "dist -o result", "dist"), + download, install, newTestsuite("hakurei/testsuite/sandbox", ""), }, @@ -55,6 +56,7 @@ var _ = (&Workflow{ Name: "Sandbox (with race instrument)", On: "rosa", + Needs: []string{"dist-race"}, Steps: []Step{ fixup, checkout, @@ -68,7 +70,7 @@ var _ = (&Workflow{ "pipewire", ), - newCIRequest("distribution", "race -o result", "dist"), + _download, install, newTestsuite("hakurei/testsuite/sandbox", ""), }, @@ -78,13 +80,14 @@ var _ = (&Workflow{ Name: "ShareFS", On: "rosa", + Needs: []string{"dist"}, Steps: []Step{ fixup, checkout, toolchain, newPackages(0, nil, "fuse3", "fsmark"), - newCIRequest("distribution", "dist -o result", "dist"), + download, install, { @@ -110,13 +113,36 @@ var _ = (&Workflow{ Name: "Create distribution", On: "rosa", + Outputs: []KV[string]{ + {"rev", "${{ steps.dist.outputs.rev }}"}, + }, + + Steps: []Step{ + fixup, + checkout, + newCIRequest("distribution", "dist -o result", "dist"), + newUploadArtifact( + "distribution", + "dist-${{ steps.dist.outputs.rev }}", + ), + }, + }}, + + {"dist-race", Job{ + Name: "Create distribution (with race instrument)", + On: "rosa", + + Outputs: []KV[string]{ + {"rev", "${{ steps.dist.outputs.rev }}"}, + }, + Steps: []Step{ fixup, checkout, - newCIRequest("distribution", "dist -o result", "dist-test"), + newCIRequest("distribution", "race -o result", "dist"), newUploadArtifact( "distribution", - "dist-${{ steps.dist-test.outputs.rev }}", + "dist-${{ steps.dist.outputs.rev }}-race", ), }, }}, -- cgit v1.3.1