From 747a1918e010a24d232eda10b575975b854f7954 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Tue, 5 Apr 2022 09:43:46 -0400 Subject: [PATCH] update naming --- .../actions/{prettier => js-lint}/action.yml | 4 ++-- .github/workflows/lint.yml | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) rename .github/actions/{prettier => js-lint}/action.yml (91%) diff --git a/.github/actions/prettier/action.yml b/.github/actions/js-lint/action.yml similarity index 91% rename from .github/actions/prettier/action.yml rename to .github/actions/js-lint/action.yml index d24c65e8..da945d93 100644 --- a/.github/actions/prettier/action.yml +++ b/.github/actions/js-lint/action.yml @@ -1,6 +1,6 @@ # Define action name, description, and inputs -name: "Prettier Lint" -description: "Lint code with Prettier" +name: "JS Lint" +description: "Lint code with Prettier and eslint" inputs: working-directory: required: false diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d77e602f..eb6de86e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,8 +4,8 @@ on: pull_request: jobs: - # Determine what the prettier changes are - prettier-changes: + # Determine what the js changes are + js-changes: runs-on: ubuntu-latest outputs: packages: ${{ steps.filter.outputs.changes }} @@ -19,6 +19,7 @@ jobs: # key will be returned in the output. filters: | packages/dashboard: packages/dashboard/** + packages/dashboard-v2: packages/dashboard-v2/** packages/dnslink-api: packages/dnslink-api/** packages/handshake-api: packages/handshake-api/** packages/health-check: packages/health-check/** @@ -46,18 +47,18 @@ jobs: packages/health-check/Dockerfile: packages/health-check/Dockerfile packages/website/Dockerfile: packages/website/Dockerfile - # Run the prettier lint if there are changes to any of the prettier packages - prettier: - needs: prettier-changes + # Run the js lint if there are changes to any of the js packages + js-lint: + needs: js-changes runs-on: ubuntu-latest strategy: fail-fast: false matrix: - working-directory: ${{ fromJSON(needs.prettier-changes.outputs.packages) }} + working-directory: ${{ fromJSON(needs.js-changes.outputs.packages) }} steps: - uses: actions/checkout@v2 - - name: Run Prettier Action - uses: ./.github/actions/prettier + - name: Run JS-Lint Action + uses: ./.github/actions/js-lint with: working-directory: ${{ matrix.working-directory }}