diff --git a/internal/rosa/make.go b/internal/rosa/make.go index 8b1103d6..710225a2 100644 --- a/internal/rosa/make.go +++ b/internal/rosa/make.go @@ -173,6 +173,7 @@ make \ scriptMake += attr.ScriptCheckEarly + `make \ ` + jobsFlagE + ` \ ` + loadFlagE + ` \ + AM_COLOR_TESTS=always \ ` if len(attr.Check) > 0 { scriptMake += strings.Join(attr.Check, " \\\n\t") diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index 8287795d..f5a67a98 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -322,6 +322,8 @@ type PackageAttr struct { // Hint for an early variant of toybox to be used when available. Early bool + // Whether to omit output colour environment variables. + NoColor bool // Exclude the LLVM toolchain. NoToolchain bool // Whether the resulting [pkg.Artifact] is exclusive. @@ -399,6 +401,12 @@ func (t Toolchain) New( const lcMessages = "LC_MESSAGES=C.UTF-8" srn := rn env := slices.Clone(attr.Env) + if !attr.NoColor { + env = append(env, + "CLICOLOR_FORCE=1", + "FORCE_COLOR=1", + ) + } var extraBoot []ArtifactH switch t.stage {