From 40a30fc4f2bbba643f8b55e6408e7fd16688df53 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Fri, 1 Dec 2023 16:14:17 -0800 Subject: [PATCH] chore(ci): cleanup/combine linter actions Signed-off-by: Sam Gammon --- .github/workflows/linter.action.yml | 19 ------------------- .github/workflows/linter.code.yml | 12 +++++++++--- 2 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 .github/workflows/linter.action.yml diff --git a/.github/workflows/linter.action.yml b/.github/workflows/linter.action.yml deleted file mode 100644 index 2c4ea27..0000000 --- a/.github/workflows/linter.action.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: "Check: Action Lint" - -on: - pull_request: - branches: - - main - push: - branches-ignore: - - main - -permissions: - contents: read - -jobs: - lint: - name: "Check: Action Lint" - permissions: - contents: read - uses: elide-dev/build-infra/.github/workflows/lint.action.yml diff --git a/.github/workflows/linter.code.yml b/.github/workflows/linter.code.yml index eaee87e..a844639 100644 --- a/.github/workflows/linter.code.yml +++ b/.github/workflows/linter.code.yml @@ -1,18 +1,18 @@ -name: "Check: Code Lint" +name: "Check: Lint" on: pull_request: branches: - main push: - branches-ignore: + branches: - main permissions: contents: read jobs: - lint: + lint-code: name: "Check: Lint" runs-on: ubuntu-latest @@ -51,3 +51,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TYPESCRIPT_DEFAULT_STYLE: prettier VALIDATE_JSCPD: false + + lint-action: + name: "Check: Action Lint" + permissions: + contents: read + uses: elide-dev/build-infra/.github/workflows/lint.action.yml