From 0dd95970a42e11a70a2f44e3754af812b55ae6ed Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 7 May 2026 19:49:35 +0900 Subject: [PATCH] internal/rosa/git: disable more broken tests These are causing too many spurious failures. Signed-off-by: Ophestra --- internal/rosa/all.go | 3 ++- internal/rosa/git.go | 3 +++ internal/rosa/rosa.go | 2 +- internal/rosa/stage0.go | 39 +++++++++++++++++---------------------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/internal/rosa/all.go b/internal/rosa/all.go index c8eddd7f..4966db49 100644 --- a/internal/rosa/all.go +++ b/internal/rosa/all.go @@ -183,7 +183,8 @@ const ( // PresetUnexportedStart is the first unexported preset. PresetUnexportedStart - llvmSource = iota - 1 + stage0Dist = iota - 1 + llvmSource // earlyCompilerRT is an early, standalone compiler-rt installation for the // standalone runtimes build. // diff --git a/internal/rosa/git.go b/internal/rosa/git.go index ca4e434d..069a239e 100644 --- a/internal/rosa/git.go +++ b/internal/rosa/git.go @@ -55,6 +55,9 @@ disable_test t9300-fast-import disable_test t0211-trace2-perf disable_test t1517-outside-repo disable_test t2200-add-update +disable_test t0027-auto-crlf +disable_test t7513-interpret-trailers +disable_test t7703-repack-geometric `, Check: []string{ "-C t", diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index 2eb803c8..6bf51fcb 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -266,7 +266,7 @@ func (t Toolchain) New( support = append(support, extra...) support = append(support, cureEtc{}) if t == toolchainStage0 { - support = append(support, NewStage0()) + support = append(support, t.Load(stage0Dist)) } else { support = append(support, _toolchainBusybox.New("gentoo", 0, nil, nil, nil, ` tar -C /work -xf /usr/src/stage3.tar.xz diff --git a/internal/rosa/stage0.go b/internal/rosa/stage0.go index 21c8d3ed..1862e47a 100644 --- a/internal/rosa/stage0.go +++ b/internal/rosa/stage0.go @@ -1,8 +1,6 @@ package rosa import ( - "sync" - "hakurei.app/fhs" "hakurei.app/internal/pkg" ) @@ -32,25 +30,22 @@ func init() { } } -var ( - // stage0 stores the tarball unpack artifact. - stage0 pkg.Artifact - // stage0Once is for lazy initialisation of stage0. - stage0Once sync.Once -) +func init() { + const version = "20260504" + artifactsM[stage0Dist] = Metadata{ + f: func(Toolchain) (pkg.Artifact, string) { + return newTar( + "https://hakurei.app/seed/"+version+"/"+ + "stage0-"+triplet()+".tar.bz2", + perArch[string]{ + "amd64": "IQjFDkiAVLo1XzflgMMiLP3gnVY2hhDMTzl-QqJDCQhcLQ3lLtRzjI5WCxGyW_lk", + "arm64": "6fmwl2Umx2QssKQvxxb1JOGkAjzfA_MXKku0jVdGjYGb35OvwEVA5NYtd0HIy3yH", + }.unwrap(), + pkg.TarBzip2, + ), version + }, -// NewStage0 returns a stage0 distribution created from curing [Stage0]. -func NewStage0() pkg.Artifact { - stage0Once.Do(func() { - stage0 = newTar( - "https://hakurei.app/seed/20260504/"+ - "stage0-"+triplet()+".tar.bz2", - perArch[string]{ - "amd64": "IQjFDkiAVLo1XzflgMMiLP3gnVY2hhDMTzl-QqJDCQhcLQ3lLtRzjI5WCxGyW_lk", - "arm64": "6fmwl2Umx2QssKQvxxb1JOGkAjzfA_MXKku0jVdGjYGb35OvwEVA5NYtd0HIy3yH", - }.unwrap(), - pkg.TarBzip2, - ) - }) - return stage0 + Name: "stage0-dist", + Description: "Rosa OS stage0 bootstrap seed", + } }