From d992fc6103f71d5cb29a9adf7b8161998c64173c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Jul 2021 19:58:35 +0000 Subject: [PATCH 1/7] Generate diagrams --- example-outputs/mermaidmd.md | 2 ++ example-outputs/plantuml.puml | 3 +++ example-outputs/yuml.yuml | 2 ++ example-outputs/yumlmd.md | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/example-outputs/mermaidmd.md b/example-outputs/mermaidmd.md index 46cc0ec..fb70831 100644 --- a/example-outputs/mermaidmd.md +++ b/example-outputs/mermaidmd.md @@ -1,5 +1,7 @@ ```mermaid classDiagram DependencyTree --> DependencyTreeConfig + DependencyTreeConfig --> Assembly + DependencyTreeConfig --> IConfiguration ``` diff --git a/example-outputs/plantuml.puml b/example-outputs/plantuml.puml index b59e6d2..4df13dc 100644 --- a/example-outputs/plantuml.puml +++ b/example-outputs/plantuml.puml @@ -2,5 +2,8 @@ class DependencyTree DependencyTree ---> DependencyTreeConfig +class DependencyTreeConfig +DependencyTreeConfig ---> Assembly +DependencyTreeConfig ---> IConfiguration @enduml diff --git a/example-outputs/yuml.yuml b/example-outputs/yuml.yuml index e87d0e8..736971b 100644 --- a/example-outputs/yuml.yuml +++ b/example-outputs/yuml.yuml @@ -3,3 +3,5 @@ // {generate:true} [DependencyTree]->[DependencyTreeConfig] +[DependencyTreeConfig]->[Assembly] +[DependencyTreeConfig]->[IConfiguration] diff --git a/example-outputs/yumlmd.md b/example-outputs/yumlmd.md index d9e9dd0..c7c3816 100644 --- a/example-outputs/yumlmd.md +++ b/example-outputs/yumlmd.md @@ -1 +1 @@ - + From b10d34f4dfc2ebfb521fa3c82ecc651ed54d933b Mon Sep 17 00:00:00 2001 From: Maisie Date: Thu, 8 Jul 2021 08:35:06 +0100 Subject: [PATCH 2/7] test gh action --- .github/workflows/github-action-tests.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-action-tests.yml b/.github/workflows/github-action-tests.yml index e17756b..4d3ee36 100644 --- a/.github/workflows/github-action-tests.yml +++ b/.github/workflows/github-action-tests.yml @@ -1,6 +1,8 @@ name: Use GitHub Action -on: push +on: + push: + branches: [ test-pr ] jobs: @@ -62,8 +64,13 @@ jobs: echo '${{ steps.generate_plantuml.outputs.result }}' > example-outputs/plantuml.puml echo '${{ steps.generate_mermaidmd.outputs.result }}' > example-outputs/mermaidmd.md - - uses: EndBug/add-and-commit@v7 - name: Commit Changes + # - uses: EndBug/add-and-commit@v7 + # name: Commit Changes + # with: + # default_author: github_actions + # message: 'Generate diagrams' + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3 with: - default_author: github_actions - message: 'Generate diagrams' + title: 'Generate diagrams' From 078e1751d2d8db94ee46598c23f6aa28edf70a0a Mon Sep 17 00:00:00 2001 From: Maisie Date: Thu, 8 Jul 2021 08:37:51 +0100 Subject: [PATCH 3/7] remove diagram --- example-outputs/mermaidmd.md | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 example-outputs/mermaidmd.md diff --git a/example-outputs/mermaidmd.md b/example-outputs/mermaidmd.md deleted file mode 100644 index fb70831..0000000 --- a/example-outputs/mermaidmd.md +++ /dev/null @@ -1,7 +0,0 @@ -```mermaid -classDiagram - DependencyTree --> DependencyTreeConfig - DependencyTreeConfig --> Assembly - DependencyTreeConfig --> IConfiguration - -``` From 715449cd72f0f67b198e40d9b3d87c6103c8bf94 Mon Sep 17 00:00:00 2001 From: Maisie Date: Thu, 8 Jul 2021 08:44:50 +0100 Subject: [PATCH 4/7] generate diagrams on pr --- .github/workflows/github-action-tests.yml | 18 +++++++----------- Dockerfile | 2 ++ runindocker.sh | 1 + 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/github-action-tests.yml b/.github/workflows/github-action-tests.yml index 4d3ee36..b1ec70b 100644 --- a/.github/workflows/github-action-tests.yml +++ b/.github/workflows/github-action-tests.yml @@ -1,8 +1,9 @@ name: Use GitHub Action on: - push: - branches: [ test-pr ] + pull_request: + branches: + - main jobs: @@ -64,13 +65,8 @@ jobs: echo '${{ steps.generate_plantuml.outputs.result }}' > example-outputs/plantuml.puml echo '${{ steps.generate_mermaidmd.outputs.result }}' > example-outputs/mermaidmd.md - # - uses: EndBug/add-and-commit@v7 - # name: Commit Changes - # with: - # default_author: github_actions - # message: 'Generate diagrams' - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 + - uses: EndBug/add-and-commit@v7 + name: Commit Changes with: - title: 'Generate diagrams' + default_author: github_actions + message: 'Generate diagrams' diff --git a/Dockerfile b/Dockerfile index d702ba4..32eb6c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,8 @@ LABEL com.github.actions.color="orange" ARG ASSEMBLY_LOCATION ENV ASSEMBLY_LOCATION=$ASSEMBLY_LOCATION +ARG ASSEMBLY_PATTERN_MATCH +ENV ASSEMBLY_PATTERN_MATCH=$ASSEMBLY_PATTERN_MATCH ARG APPLICATION_CONFIG_LOCATION ENV APPLICATION_CONFIG_LOCATION=$APPLICATION_CONFIG_LOCATION ARG ROOT_TYPE diff --git a/runindocker.sh b/runindocker.sh index fe056fc..3b21d43 100755 --- a/runindocker.sh +++ b/runindocker.sh @@ -1,6 +1,7 @@ #!/bin/bash result="$(ASSEMBLY_LOCATION=$ASSEMBLY_LOCATION \ + ASSEMBLY_PATTERN_MATCH=$ASSEMBLY_PATTERN_MATCH \ APPLICATION_CONFIG_LOCATION=$APPLICATION_CONFIG_LOCATION \ ROOT_TYPES=$ROOT_TYPES \ SKIP_TYPES=$SKIP_TYPES \ From 7cc7dfed22fc1933298b6bafc93d41eb1aac8844 Mon Sep 17 00:00:00 2001 From: Maisie Date: Thu, 8 Jul 2021 08:47:46 +0100 Subject: [PATCH 5/7] update readme --- .gitignore | 3 +++ README.md | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cae4941..a40dd01 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ obj .vscode temp +out +local +examples diff --git a/README.md b/README.md index 02f2803..855ec23 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Lively +# Lively 🌳 [![Release Nuget Package](https://github.com/maisiesadler/lively/actions/workflows/release.yml/badge.svg)](https://github.com/maisiesadler/lively/actions/workflows/release.yml) [![Generate Diagrams](https://github.com/maisiesadler/lively/actions/workflows/generate-diagrams.yml/badge.svg)](https://github.com/maisiesadler/lively/actions/workflows/generate-diagrams.yml) @@ -104,7 +104,8 @@ System.Console.WriteLine(diagram); | Name | Environment Variable | CLI setting | | Required | | -- | -- | -- | -- | -- | -| Assembly Location | `ASSEMBLY_LOCATION` | `-a` `--assembly` | The location of the assembly to read | Yes | +| Assembly Location | `ASSEMBLY_LOCATION` | `-a` `--assembly` | The assembly file location or directory containing assemblies to load | Yes | +| Assembly Pattern Match | `ASSEMBLY_PATTERN_MATCH` | `--pattern-match` | Regex pattern of assemblies to load in directory | No | | Root types | `ROOT_TYPES` | `-t` `--root-types` | The root type to use for the dependency tree, multiple values can be used as a csv input | Yes | | Skip types | `SKIP_TYPES` | `-s` `--skip-types` | Types to not include in diagram, multiple values can be used as a csv input | No | | Assembly Config Location | `ASSEMBLY_CONFIG_LOCATION` | `--assembly-config` | The location of the configuration file required to build IConfiguration for Startup | No | From 54d9583a308cf865b53373f4d447a1ae0a857fe0 Mon Sep 17 00:00:00 2001 From: Maisie Date: Thu, 8 Jul 2021 08:52:19 +0100 Subject: [PATCH 6/7] change file --- example-outputs/mermaidmd.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/example-outputs/mermaidmd.md b/example-outputs/mermaidmd.md index fb70831..cca8e96 100644 --- a/example-outputs/mermaidmd.md +++ b/example-outputs/mermaidmd.md @@ -1,7 +1,5 @@ -```mermaid +```mermaid classDiagram DependencyTree --> DependencyTreeConfig - DependencyTreeConfig --> Assembly - DependencyTreeConfig --> IConfiguration - + ``` From 8e49090c196f474582d675bd2bd618458cc9f7c6 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Jul 2021 07:53:57 +0000 Subject: [PATCH 7/7] Generate diagrams --- example-outputs/mermaidmd.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/example-outputs/mermaidmd.md b/example-outputs/mermaidmd.md index cca8e96..fb70831 100644 --- a/example-outputs/mermaidmd.md +++ b/example-outputs/mermaidmd.md @@ -1,5 +1,7 @@ -```mermaid +```mermaid classDiagram DependencyTree --> DependencyTreeConfig - + DependencyTreeConfig --> Assembly + DependencyTreeConfig --> IConfiguration + ```