kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #76 from blocklayerhq/output-no-merge

Browse Source 
output: merge base/input/output into a single state.cue
This commit is contained in:
Andrea Luzzardi
2021-01-26 16:53:32 -08:00
committed by GitHub
parent f933278d43 04526b5b78
commit cc5a48d39b
4 changed files with 89 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dagger/env.go
View File

@@ -118,11 +118,27 @@ func (env *Env) Export(fs FS) (FS, error) {
// client which is undesirable.
// Once Value.Save() resolves non-builtin imports with a tree shake,
// we can use it here.
fs = env.base.SaveJSON(fs, "base.cue")
fs = env.input.SaveJSON(fs, "input.cue")
// FIXME: Exporting base/input/output separately causes merge errors.
// For instance, `foo: string | *"default foo"` gets serialized as
// `{"foo":"default foo"}`, which will fail to merge if output contains
// a different definition of `foo`.
//
// fs = env.base.SaveJSON(fs, "base.cue")
// fs = env.input.SaveJSON(fs, "input.cue")
// if env.output != nil {
// fs = env.output.SaveJSON(fs, "output.cue")
// }
// For now, export a single `state.cue` containing the combined output.
var err error
state := env.state
if env.output != nil {
fs = env.output.SaveJSON(fs, "output.cue")
state, err = state.Merge(env.output)
if err != nil {
return env.s.Scratch(), err
}
}
fs = state.SaveJSON(fs, "state.cue")
return fs, nil
}