Skip to content

Commit f19334c

Browse files
WVerlaekona-agent
andcommitted
fix: add phase span for SBOM generation
SBOM phase was handled inline without calling PhaseAwareReporter. Co-authored-by: Ona <no-reply@ona.com>
1 parent fb41dc8 commit f19334c

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

pkg/leeway/build.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,12 +1262,19 @@ func (p *Package) build(buildctx *buildContext) (err error) {
12621262
// Generate SBOM if enabled (after packaging - written alongside artifact)
12631263
// SBOM files are stored outside the tar.gz to maintain artifact determinism.
12641264
if p.C.W.SBOM.Enabled {
1265+
if par, ok := buildctx.Reporter.(PhaseAwareReporter); ok {
1266+
par.PackageBuildPhaseStarted(p, PackageBuildPhaseSBOM)
1267+
}
12651268
pkgRep.phaseEnter[PackageBuildPhaseSBOM] = time.Now()
12661269
pkgRep.Phases = append(pkgRep.Phases, PackageBuildPhaseSBOM)
1267-
if err := writeSBOMToCache(buildctx, p, builddir); err != nil {
1268-
return err
1269-
}
1270+
sbomErr := writeSBOMToCache(buildctx, p, builddir)
12701271
pkgRep.phaseDone[PackageBuildPhaseSBOM] = time.Now()
1272+
if par, ok := buildctx.Reporter.(PhaseAwareReporter); ok {
1273+
par.PackageBuildPhaseFinished(p, PackageBuildPhaseSBOM, sbomErr)
1274+
}
1275+
if sbomErr != nil {
1276+
return sbomErr
1277+
}
12711278
}
12721279

12731280
// Register newly built package

0 commit comments

Comments
 (0)