Use derived artifact catalogs throughout planning and execution
This commit is contained in:
@@ -467,7 +467,7 @@ func needsObjectStoreForRun(cfg *config.Config, stages []stage.Stage, effectiveS
|
||||
if !effective.Resolved() && cfg.Pipeline.Scriptorium != nil {
|
||||
var err error
|
||||
effective, err = artifacts.ResolveEffectiveArtifactSet(
|
||||
artifacts.ConfiguredArtifactDefinitions(cfg.Pipeline.Scriptorium.Artifacts),
|
||||
artifacts.ConfiguredArtifactDefinitions(cfg.ConcreteArtifacts()),
|
||||
nil,
|
||||
)
|
||||
if err != nil {
|
||||
@@ -523,5 +523,5 @@ func configuredScriptoriumArtifacts(cfg *config.Config) map[string]config.Script
|
||||
if cfg == nil || cfg.Pipeline == nil || cfg.Pipeline.Scriptorium == nil {
|
||||
return nil
|
||||
}
|
||||
return cfg.Pipeline.Scriptorium.Artifacts
|
||||
return cfg.ConcreteArtifacts()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user