New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: multiple specs in one file, with internal dependency resolution #146

Draft

pmengelbert wants to merge 47 commits into Azure:main from pmengelbert:pmengelbert/multi_spec/1

Contributor

pmengelbert commented Feb 20, 2024

Take a look at test/fixtures/eraser-manager-build-dep.yml and test/fixtures/eraser-manager-runtime-dep.yml

Try building different targets.

If there is more than one spec in a spec file, you can specify the target with (for the example kubernetes-eraser-manager):
--target=kubernetes-eraser-manager/mariner2/rpm or --target=kubernetes-eraser-manager-compat/mariner2/container, or similar.

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

pmengelbert force-pushed the pmengelbert/multi_spec/1 branch 2 times, most recently from 3fbe60e to bc0fcd6 Compare

February 20, 2024 19:49

adamperlin reviewed

View reviewed changes

cmd/tsort/main.go Outdated Show resolved Hide resolved

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

adamperlin reviewed

View reviewed changes

graph.go Outdated Show resolved Hide resolved

pmengelbert force-pushed the pmengelbert/multi_spec/1 branch 4 times, most recently from b4ea546 to 39a58b3 Compare

February 20, 2024 21:48

cpuguy83 added this to the v0.2.0 milestone

pmengelbert force-pushed the pmengelbert/multi_spec/1 branch from a45ae00 to bcce93d Compare

February 21, 2024 19:06

Contributor Author

pmengelbert commented Feb 21, 2024 •

edited

Loading

Merge all the RPM states rather than looping through a spec's build deps. This will improve caching

This was referenced Feb 21, 2024

Preserve Source RPMs of build dependencies #149

Open

Use rpmbuild to build dependencies #150

Open

Contributor Author

pmengelbert commented Feb 21, 2024 •

edited

Loading

Remove the graph from global state.

pmengelbert force-pushed the pmengelbert/multi_spec/1 branch from bbd1e8c to 116c521 Compare

February 22, 2024 21:05

Contributor Author

pmengelbert commented Feb 22, 2024

In addition to some other changes to the graph, I have made it (and the specs within it) immutable. Once initialized, it can't be changed.

pmengelbert force-pushed the pmengelbert/multi_spec/1 branch 3 times, most recently from 330d50a to febfe63 Compare

February 26, 2024 20:22

pmengelbert added 4 commits

February 28, 2024 09:42


          save progress

0779be2

Signed-off-by: Peter Engelbert <[email protected]>


          save

8f4accf

Signed-off-by: Peter Engelbert <[email protected]>


          Working tsort

523740e

Signed-off-by: Peter Engelbert <[email protected]>


          save progress

5b13547

Signed-off-by: Peter Engelbert <[email protected]>

pmengelbert added 26 commits

February 28, 2024 09:42


          Remove dead commented code

eeb3331

Signed-off-by: Peter Engelbert <[email protected]>


          Make topSort method idempotent

e5c3bce

Signed-off-by: Peter Engelbert <[email protected]>


          Remove strongConnect error, as it's unused

27726a3

Signed-off-by: Peter Engelbert <[email protected]>


          Clean up unused dependency property and rename vertex fields

de9dcda

Signed-off-by: Peter Engelbert <[email protected]>


          Rename minimum->min

4f8a521

Signed-off-by: Peter Engelbert <[email protected]>


          Add comments describing what OrderedSlice does

055d3d6

Also, remove `targetSlice` since it is not necessary

Signed-off-by: Peter Engelbert <[email protected]>


          Clean up code

62d83cb

Signed-off-by: Peter Engelbert <[email protected]>


          Please the linter

9ddbc66

Signed-off-by: Peter Engelbert <[email protected]>


          Remove redundant return and document function.

080f400

Signed-off-by: Peter Engelbert <[email protected]>


          Restore backwards compatibility

de18f34

Signed-off-by: Peter Engelbert <[email protected]>


          Refactor topSort into 3 methods

7f9b9d5

Signed-off-by: Peter Engelbert <[email protected]>


          Remove ./cmd/tsort

ad39d97

Signed-off-by: Peter Engelbert <[email protected]>


          Bounds check

b039da7

Signed-off-by: Peter Engelbert <[email protected]>


          Refactor

13a0065

Signed-off-by: Peter Engelbert <[email protected]>


          Remove unused function

6fbf3ce

Signed-off-by: Peter Engelbert <[email protected]>


          save

681e11e

Signed-off-by: Peter Engelbert <[email protected]>


          Revert "save"

ec9f1d2

This reverts commit 8722210.


          Save

01994fa

Signed-off-by: Peter Engelbert <[email protected]>


          Add arg subsitution for otherwise-immutable specs

4ae99f9

Make the specs immutable, with one exception that they may be modified
once in order to substitute the build args.

Signed-off-by: Peter Engelbert <[email protected]>


          Discard vertices and edges once graph is built

01a0134

Signed-off-by: Peter Engelbert <[email protected]>


          Initialize graph only once

60b3372

Signed-off-by: Peter Engelbert <[email protected]>


          Clean up graph implementation

2e769dd

Signed-off-by: Peter Engelbert <[email protected]>


          save

bbbbd6c

Signed-off-by: Peter Engelbert <[email protected]>


          Completely eliminate global state

f1497eb

Signed-off-by: Peter Engelbert <[email protected]>


          Please the linter

Signed-off-by: Peter Engelbert <[email protected]>


          Do not allow graph construction outside of dalec package

2419d5c

Signed-off-by: Peter Engelbert <[email protected]>

pmengelbert force-pushed the pmengelbert/multi_spec/1 branch from febfe63 to 2419d5c Compare

February 28, 2024 14:44

cpuguy83 modified the milestones: v0.2.0, v0.3.0

cpuguy83 removed this from the v0.3.0 milestone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet