Skip to content
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.

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

Feat/graph utils #737

Merged
merged 7 commits into from
Oct 17, 2023
Merged

Feat/graph utils #737

merged 7 commits into from
Oct 17, 2023

Conversation

hsjobeki
Copy link
Contributor

@hsjobeki hsjobeki commented Oct 12, 2023

Adds some graph utilities.
(Renamed findCycles.nix into graphUtils.nix)

  • SanitizeGraph returns a nix buildable dependency tree. (Even if the previous graph has cycles)
  • Compat functions that allow backwards compatibility for potential use cases in V1 (node granularBuilder)

Still TODO: Fix the old cycle remover, so it supports

Multiple connected cycles in the graph

e.g.

a->c
b->c
c->d
d->a
d->b

@hsjobeki hsjobeki requested a review from DavHau October 13, 2023 08:35
@DavHau
Copy link
Member

DavHau commented Oct 17, 2023

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Oct 17, 2023

rebase

✅ Branch has been successfully rebased

@DavHau
Copy link
Member

DavHau commented Oct 17, 2023

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Oct 17, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Auto-merging tests/nix-unit/test_graph_utils/default.nix
CONFLICT (add/add): Merge conflict in tests/nix-unit/test_graph_utils/default.nix
Auto-merging tests/nix-unit/test_graph_utils/findCycles.nix
CONFLICT (content): Merge conflict in tests/nix-unit/test_graph_utils/findCycles.nix
Auto-merging tests/nix-unit/test_graph_utils/sanitizeGraph.nix
CONFLICT (add/add): Merge conflict in tests/nix-unit/test_graph_utils/sanitizeGraph.nix
error: could not apply afdb019... add more graph utilities
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply afdb019... add more graph utilities

@mergify mergify bot merged commit c3e07bf into nix-community:main Oct 17, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants