Skip to content

Implement labelling of clusters on the Graphviz diagram.#255

Merged
talex5 merged 1 commit intoocurrent:masterfrom
ewanmellor:cluster-labels
Jul 5, 2021
Merged

Implement labelling of clusters on the Graphviz diagram.#255
talex5 merged 1 commit intoocurrent:masterfrom
ewanmellor:cluster-labels

Conversation

@ewanmellor
Copy link
Copy Markdown
Contributor

Add an optional label argument to list_iter, list_map, option_map.

Pass this through the List_map and Option_map metadata options to the
label of the subgraph in the Graphviz input.

Signed-off-by: Ewan Mellor ewan@tarides.com

Copy link
Copy Markdown
Contributor

@talex5 talex5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks nice. However, it doesn't compile on any version of OCaml... how are you testing this??

@ewanmellor
Copy link
Copy Markdown
Contributor Author

I have fixed and rebased. I made the mistake of compiling as a submodule inside ocaml-ci, and I didn't realize that would miss a bunch of stuff inside ocurrent itself. Apologies.

Copy link
Copy Markdown
Contributor

@talex5 talex5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Testing it a bit more, it seems that the label is inherited by nested clusters. I assume that's not supposed to happen...

Add an optional label argument to list_iter, list_map, option_map.

Pass this through the List_map and Option_map metadata options to the
label of the subgraph in the Graphviz input.

This changes the expected test results because the label is inherited
by subgraphs by default, so we need to explicitly wipe it with each
subgraph.

Signed-off-by: Ewan Mellor <ewan@tarides.com>
@ewanmellor
Copy link
Copy Markdown
Contributor Author

Thanks. Testing it a bit more, it seems that the label is inherited by nested clusters. I assume that's not supposed to happen...

I updated this patch to explicitly set the label to the empty string on each unlabeled cluster. This stops the label from being inherited by subclusters.

@talex5 talex5 merged commit 6d853eb into ocurrent:master Jul 5, 2021
@talex5
Copy link
Copy Markdown
Contributor

talex5 commented Jul 5, 2021

Thanks!

tmcgilchrist added a commit to tmcgilchrist/opam-repository that referenced this pull request Apr 7, 2022
…, current_github, current_git, current_examples, current_docker and current (0.6)

CHANGES:

Core:

- Implement labelling of clusters on the Graphviz diagram
  (@ewanmellor ocurrent/ocurrent#255)

- Abort propagation on constant/equal changes (@art-w ocurrent/ocurrent#318)

API:

- GitHub: Record build status using CheckRun (@tmcgilchrist ocurrent/ocurrent#279)

- GitHub: Add details_url to check_run. (@tmcgilchrist ocurrent/ocurrent#282)

- GitHub: Add Current_github.Api.cmdliner_opt to allow writing
  pipelines which can optionally be run as GitHub apps. (@talex5 ocurrent/ocurrent#281)

- GitHub: Provide markdown details for CheckRun. (@tmcgilchrist ocurrent/ocurrent#288)

- GitHub: Fix wrong name used for repository (@tmcgilchrist ocurrent/ocurrent#289 ocurrent/ocurrent#290)

- GitHub: Support Github rebuild via webooks. (@tmcgilchrist ocurrent/ocurrent#283)

- GitHub: monitor GraphQL queries (@art-w ocurrent/ocurrent#298)

- GitHub: Limit CheckRunStatus summary and text fields to 65535.
  (@tmcgilchrist ocurrent/ocurrent#300)

- GitHub: Log extra context for Webhook validation failure.
  (@tmcgilchrist ocurrent/ocurrent#302)

- GitLab: Initial GitLab plugin work. (@tmcgilchrist ocurrent/ocurrent#299)

- Git: Make git reset less verbose (@kit-ty-kate ocurrent/ocurrent#293)

Web UI:

- Use Lwt.pause instead of Lwt_unix.yield (@MisterDA ocurrent/ocurrent#297)

- Use `ansi` instead of `current_ansi` (@samoht ocurrent/ocurrent#321)

- Show line numbers and allow jumping to specific lines in job
  logs (@punchagan ocurrent/ocurrent#309)

Docker:

- Explicitly set confirmation levels to allow for
  manually triggered jobs. (@tmcgilchrist ocurrent/ocurrent#304)

- Stop using `Dockerfile.t` completely and use strings instead.
  (@MisterDA ocurrent/ocurrent#301 ocurrent/ocurrent#316)

Other:

- Update to cohttp 4.0.0 (ocurrent/ocurrent#274, @talex5)

- Move `Current_incr` to its own repository (ocurrent/ocurrent#284, @talex5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants