From f847a05e106b97d20959d35dc4bb4ed5aff6ff96 Mon Sep 17 00:00:00 2001 From: Maisie Date: Fri, 9 Jul 2021 21:26:31 +0100 Subject: [PATCH] Test pr (#6) * Generate diagrams * test gh action * remove diagram * generate diagrams on pr * update readme * change file * Generate diagrams Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/github-action-tests.yml | 5 ++++- .gitignore | 3 +++ Dockerfile | 2 ++ README.md | 5 +++-- runindocker.sh | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-action-tests.yml b/.github/workflows/github-action-tests.yml index e17756b..b1ec70b 100644 --- a/.github/workflows/github-action-tests.yml +++ b/.github/workflows/github-action-tests.yml @@ -1,6 +1,9 @@ name: Use GitHub Action -on: push +on: + pull_request: + branches: + - main jobs: 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/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/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 | 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 \