examples: fix up #64
examples: fix up #64
Conversation
|
Note that with the current commits this is still broken. This is due to the interaction between merging maps, includes, and being inside a define block. Very fun! |
There was a problem hiding this comment.
I am not sure that the goal at this stage should be to have an implementation for our spec. I think the goal should be to create the best possible yaml via discussions and use-cases and then think about the implementation. I worry we make compromises too early otherwise (but happy to hear input from others here of course, every team does things differently).
|
|
||
| otk.include: "minimal-common.yaml" | ||
| otk.target.osbuild: |
There was a problem hiding this comment.
I wonder if we can do better here, not including the pipelines from something like "common.yaml" will mean we have quite a bit of duplication.
There was a problem hiding this comment.
We could resolve includes before omnifest validation.
| @@ -1,7 +1,14 @@ | |||
| otk.version: 1 | |||
|
|
|||
| otk.define: | |||
| version: 40 | |||
| architecture: "aarch64" | |||
| otk.op.join: | |||
There was a problem hiding this comment.
Is this change driven by the current implementation or is this the yaml we want? I'm asking because it does not feel like an improvement and I think at this stage of the project we should aim for the best possible yaml and then think about the implementation (and being able to have a toplevel with otk.define and an include that also otk.defines stuff without the need for an explicit otk.op.join seems nice.
There was a problem hiding this comment.
This is driven by the current implementation and what is possible in it. And yes; the 'way it is' (in main) is nicer :)
It should test the directive directly instead of going through the omnifset parsing as well. Signed-off-by: Simon de Vlieger <[email protected]>
Desugar is currently not correctly replacing multiple variables in a string. This adds failing test cases for that. Signed-off-by: Simon de Vlieger <[email protected]>
Use regular expressions to do replacements. Previously we didn't replace multiple occurences of variables correctly. Signed-off-by: Simon de Vlieger <[email protected]>
Sadly a lot of the deduplication work that has been done has to be undone for now due to the way directives work. Let's get main working then put them back in in feature branches. Signed-off-by: Simon de Vlieger <[email protected]>
|
Going to close this PR and resubmit due to shenanigans going on on GitHub/my local checkout. |
The examples merged in #52 were broken (and I merged them knowing this) so now let's work to make the implementation support them.
Relevant bugs: