From 67290c9743c1437599df97d291e9bd8bd7780285 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 21 May 2026 14:17:30 +0900 Subject: [PATCH] internal/rosa: enforce exclusions This restores unexported artifact behaviour. Signed-off-by: Ophestra --- internal/rosa/package/kernel/package.az | 1 + internal/rosa/package/musl/package.az | 1 + internal/rosa/package/stage0.az | 1 + internal/rosa/state.go | 22 ++++++++++++++++++++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/internal/rosa/package/kernel/package.az b/internal/rosa/package/kernel/package.az index 70dbe28d..d768ebac 100644 --- a/internal/rosa/package/kernel/package.az +++ b/internal/rosa/package/kernel/package.az @@ -1,6 +1,7 @@ package kernel-source { description = "unpatched Linux kernel source tree"; website = "https://kernel.org"; + exclude = true; version* = "6.12.87"; output = remoteTar { diff --git a/internal/rosa/package/musl/package.az b/internal/rosa/package/musl/package.az index 893567e8..11ffd0c0 100644 --- a/internal/rosa/package/musl/package.az +++ b/internal/rosa/package/musl/package.az @@ -1,5 +1,6 @@ package musl-source { description = "an implementation of the C standard library - source code"; + exclude = true; version* = "1.2.6"; output = remoteTar { diff --git a/internal/rosa/package/stage0.az b/internal/rosa/package/stage0.az index 02930657..d1276b82 100644 --- a/internal/rosa/package/stage0.az +++ b/internal/rosa/package/stage0.az @@ -1,5 +1,6 @@ package stage0-dist { description = "Rosa OS stage0 bootstrap seed"; + exclude = true; version* = "20260504"; output = remoteTar { diff --git a/internal/rosa/state.go b/internal/rosa/state.go index 6ff6f1cf..20a03fdb 100644 --- a/internal/rosa/state.go +++ b/internal/rosa/state.go @@ -389,8 +389,8 @@ func (s *S) Count() int { return int(s.artifactCount.Load()) } -// Collect returns all [ArtifactH] registered to s. -func (s *S) Collect() (handles P) { +// collect returns all [ArtifactH] registered to s. +func (s *S) collect() (handles P) { handles = make(P, 0, s.Count()) s.artifacts.Range(func(key, _ any) bool { handles = append(handles, key.(ArtifactH)) @@ -402,6 +402,23 @@ func (s *S) Collect() (handles P) { return } +// Collect returns all non-excluded [ArtifactH] registered to s. +func (s *S) Collect() (handles P) { + handles = make(P, 0, s.Count()) + s.artifacts.Range(func(key, _ any) bool { + h := key.(ArtifactH) + meta, _ := s.Std().MustLoad(h) + if !meta.Exclude { + handles = append(handles, h) + } + return true + }) + slices.SortFunc(handles, func(a, b ArtifactH) int { + return strings.Compare(a.String(), b.String()) + }) + return +} + // deferredGit is a call to Toolchain.newTagRemote from azalea. type deferredGit struct { url string @@ -915,6 +932,7 @@ func (ctx *evalContext) pf( k("description"): &meta.Description, k("website"): &meta.Website, k("version"): &meta.Version, + k("exclude"): &meta.Exclude, k("anitya"): &anitya, k("latest"): &meta.latest,