From 5259ddd4d4b1df6f0248c20dc272a75e5994fe96 Mon Sep 17 00:00:00 2001 From: Michael Simmons Date: Sun, 28 Jun 2020 13:21:52 -0500 Subject: [PATCH 1/5] use super linter --- .github/workflows/super-linter.yml | 10 ++++++++++ .github/workflows/validate-json.yml | 14 -------------- .github/workflows/validate-xml.yml | 15 --------------- .github/workflows/validate-yaml.yml | 16 ---------------- 4 files changed, 10 insertions(+), 45 deletions(-) create mode 100644 .github/workflows/super-linter.yml delete mode 100644 .github/workflows/validate-json.yml delete mode 100644 .github/workflows/validate-xml.yml delete mode 100644 .github/workflows/validate-yaml.yml diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml new file mode 100644 index 0000000..31383cf --- /dev/null +++ b/.github/workflows/super-linter.yml @@ -0,0 +1,10 @@ +name: Super Linter + +on: [pull_request] + +jobs: + super-linter: + runs-on: ubuntu-latest + steps: + - name: Super-Linter + uses: github/super-linter@v2.2.2 diff --git a/.github/workflows/validate-json.yml b/.github/workflows/validate-json.yml deleted file mode 100644 index 03e164e..0000000 --- a/.github/workflows/validate-json.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Validate JSON - -on: [pull_request] - -jobs: - verify-json-validation: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Validate JSON - uses: docker://orrosenblatt/validate-json-action:latest - env: - INPUT_SCHEMA: ./formats/json/schema.json - INPUT_JSONS: ./formats/json/whiskey.json diff --git a/.github/workflows/validate-xml.yml b/.github/workflows/validate-xml.yml deleted file mode 100644 index c641e29..0000000 --- a/.github/workflows/validate-xml.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Validate XML - -on: [pull_request] - -jobs: - verify-xml-validation: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@master - - name: Lint whiskey.xml - uses: ChristophWurst/xmllint-action@v1 - with: - xml-file: ./formats/xml/whiskey.xml - xml-schema-file: ./formats/xml/schema.xsd diff --git a/.github/workflows/validate-yaml.yml b/.github/workflows/validate-yaml.yml deleted file mode 100644 index a6eb748..0000000 --- a/.github/workflows/validate-yaml.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Validate YAML - -on: [pull_request] - -jobs: - yamllint: - name: 'Yamllint' - runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@master - - name: 'yamllint' - uses: karancode/yamllint-github-action@master - with: - yamllint_strict: true - yamllint_file_or_dir: 'formats/yaml/' From 6380e71ce02e5146323e56a2562d268247507e22 Mon Sep 17 00:00:00 2001 From: Michael Simmons Date: Sun, 28 Jun 2020 14:25:56 -0500 Subject: [PATCH 2/5] config --- .github/workflows/super-linter.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 31383cf..3f3f8e8 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -3,8 +3,13 @@ name: Super Linter on: [pull_request] jobs: - super-linter: + build: + name: Lint Code Base runs-on: ubuntu-latest steps: - - name: Super-Linter - uses: github/super-linter@v2.2.2 + - name: Checkout Code + uses: actions/checkout@v2 + - name: Lint Code Base + uses: docker://github/super-linter:v2.2.0 + env: + VALIDATE_ALL_CODEBASE: true From 4c822945566782d728a4ce56a556096e09c63e6f Mon Sep 17 00:00:00 2001 From: Michael Simmons Date: Sun, 28 Jun 2020 14:31:45 -0500 Subject: [PATCH 3/5] disable ruby linter --- .github/workflows/super-linter.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 3f3f8e8..44d9d10 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -13,3 +13,5 @@ jobs: uses: docker://github/super-linter:v2.2.0 env: VALIDATE_ALL_CODEBASE: true + VALIDATE_RUBY: false + From b56abd63f377f4f25197240f9d5587a90e6939cf Mon Sep 17 00:00:00 2001 From: Michael Simmons Date: Sun, 28 Jun 2020 14:34:56 -0500 Subject: [PATCH 4/5] enable specific linters --- .github/workflows/super-linter.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 44d9d10..05fda9d 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -12,6 +12,7 @@ jobs: - name: Lint Code Base uses: docker://github/super-linter:v2.2.0 env: - VALIDATE_ALL_CODEBASE: true - VALIDATE_RUBY: false - + VALIDATE_YAML: true + VALIDATE_JSON: true + VALIDATE_XML: true + VALIDATE_MD: true From ce8f1313e8df15b9b220e444ef93215a564212ce Mon Sep 17 00:00:00 2001 From: Michael Simmons Date: Sun, 28 Jun 2020 14:37:34 -0500 Subject: [PATCH 5/5] remove yaml linter config --- .yamllint.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .yamllint.yaml diff --git a/.yamllint.yaml b/.yamllint.yaml deleted file mode 100644 index b6d9619..0000000 --- a/.yamllint.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -extends: default - -rules: - indentation: - spaces: consistent - indent-sequences: whatever