From 759ac353b398d96450dc96f069b3d1551750e335 Mon Sep 17 00:00:00 2001 From: Cyb3r Jak3 Date: Fri, 7 May 2021 18:34:37 -0700 Subject: [PATCH] Map same arguements (#17) * Move to match input variables to the same * Fix missed check * Update documentation --- .dockerignore | 4 ++++ .github/workflows/action-test.yml | 8 ++++---- .github/workflows/integration.yml | 2 ++ CHANGELOG.md | 4 ++++ README.md | 2 +- action.yml | 2 +- entrypoint.sh | 4 ++-- output_check.sh | 2 +- 8 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..17fa40b --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +.git** +tests/** +**.md +output_check.sh diff --git a/.github/workflows/action-test.yml b/.github/workflows/action-test.yml index 8c9b6ff..034c5f4 100644 --- a/.github/workflows/action-test.yml +++ b/.github/workflows/action-test.yml @@ -36,12 +36,12 @@ jobs: config: tests/example_config.yaml action_debug: true - - name: Check Ignore - id: ignore + - name: Check Blacklist + id: blacklist uses: ./ with: root: tests/ - ignore: invalid + blacklist: invalid action_debug: true - name: Check Failure @@ -74,5 +74,5 @@ jobs: VALID_OUT: ${{ steps.valid.outputs.result }} INVALID_OUT: ${{ steps.invalid.outputs.result }} CONFIG_OUT: ${{ steps.config.outputs.result }} - IGNORE_OUT: ${{ steps.ignore.outputs.result }} + BLACKLIST_OUT: ${{ steps.blacklist.outputs.result }} EMPTY_OUT: ${{ steps.empty.outputs.result }} \ No newline at end of file diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f07fcce..8c12ca1 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -2,6 +2,8 @@ name: Integration Test on: push: + branches: + - "master" schedule: - cron: '0 0 * * 0' # Weekly on Sundays at 00:00 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0080437..7fe74cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog +## [v0.6] - 2021-05-7 + +- Map action input names to html5validator inputs + ## [v0.5] - 2021-03-27 - Adds ignore option to ignore files and directories diff --git a/README.md b/README.md index 175d0bf..68f5b0d 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Log level to use. Supported values: `DEBUG, INFO, WARNING`. Default: `Warning`. If to check css. Supported values: `true, false`. Default: `false`. -### `Ignore` +### `Blacklist` Names of files or directories to ignore. **This is not full paths** diff --git a/action.yml b/action.yml index 06dc786..055b7ad 100644 --- a/action.yml +++ b/action.yml @@ -24,7 +24,7 @@ inputs: css: description: "Checks css as well" required: false - ignore: + blacklist: description: "Files or directories to ignore in checking" required: false action_debug: diff --git a/entrypoint.sh b/entrypoint.sh index d6cb01e..8fbe369 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,8 +21,8 @@ function main() { BuildARGS+="--format ${INPUT_FORMAT}" fi - if uses "${INPUT_IGNORE}"; then - BuildARGS+=" --blacklist ${INPUT_IGNORE}" + if uses "${INPUT_BLACKLIST}"; then + BuildARGS+=" --blacklist ${INPUT_BLACKLIST}" fi if usesBoolean "${INPUT_CSS}"; then diff --git a/output_check.sh b/output_check.sh index f60fa57..78923d8 100644 --- a/output_check.sh +++ b/output_check.sh @@ -11,7 +11,7 @@ if [[ "$CONFIG_OUT" -ne 0 ]]; then echo "Config step failed" exit 1 fi -if [[ "$IGNORE_OUT" -ne 0 ]]; then +if [[ "$BLACKLIST_OUT" -ne 0 ]]; then echo "Ignore step failed" exit 1 fi