internal/rosa: enforce exclusions
Test / Create distribution (push) Failing after 1m0s
Test / ShareFS (push) Failing after 1m14s
Test / Sandbox (race detector) (push) Failing after 1m43s
Test / Sandbox (push) Failing after 1m45s
Test / Hakurei (push) Failing after 2m19s
Test / Hakurei (race detector) (push) Failing after 2m40s
Test / Flake checks (push) Has been skipped

This restores unexported artifact behaviour.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-05-21 14:17:30 +09:00
parent 443a7a30f6
commit 67290c9743
4 changed files with 23 additions and 2 deletions
+1
View File
@@ -1,6 +1,7 @@
package kernel-source { package kernel-source {
description = "unpatched Linux kernel source tree"; description = "unpatched Linux kernel source tree";
website = "https://kernel.org"; website = "https://kernel.org";
exclude = true;
version* = "6.12.87"; version* = "6.12.87";
output = remoteTar { output = remoteTar {
+1
View File
@@ -1,5 +1,6 @@
package musl-source { package musl-source {
description = "an implementation of the C standard library - source code"; description = "an implementation of the C standard library - source code";
exclude = true;
version* = "1.2.6"; version* = "1.2.6";
output = remoteTar { output = remoteTar {
+1
View File
@@ -1,5 +1,6 @@
package stage0-dist { package stage0-dist {
description = "Rosa OS stage0 bootstrap seed"; description = "Rosa OS stage0 bootstrap seed";
exclude = true;
version* = "20260504"; version* = "20260504";
output = remoteTar { output = remoteTar {
+20 -2
View File
@@ -389,8 +389,8 @@ func (s *S) Count() int {
return int(s.artifactCount.Load()) return int(s.artifactCount.Load())
} }
// Collect returns all [ArtifactH] registered to s. // collect returns all [ArtifactH] registered to s.
func (s *S) Collect() (handles P) { func (s *S) collect() (handles P) {
handles = make(P, 0, s.Count()) handles = make(P, 0, s.Count())
s.artifacts.Range(func(key, _ any) bool { s.artifacts.Range(func(key, _ any) bool {
handles = append(handles, key.(ArtifactH)) handles = append(handles, key.(ArtifactH))
@@ -402,6 +402,23 @@ func (s *S) Collect() (handles P) {
return 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. // deferredGit is a call to Toolchain.newTagRemote from azalea.
type deferredGit struct { type deferredGit struct {
url string url string
@@ -915,6 +932,7 @@ func (ctx *evalContext) pf(
k("description"): &meta.Description, k("description"): &meta.Description,
k("website"): &meta.Website, k("website"): &meta.Website,
k("version"): &meta.Version, k("version"): &meta.Version,
k("exclude"): &meta.Exclude,
k("anitya"): &anitya, k("anitya"): &anitya,
k("latest"): &meta.latest, k("latest"): &meta.latest,