From f36c1f5b919dcf8c8e8f3ed6b882af393dd72fda Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 16 Sep 2022 21:53:16 -0700 Subject: [PATCH] refactor: move shellcheck to separate job --- .github/workflows/build.yaml | 44 ++++++++++++++++++++++++++++++++++++ ci/dev/lint.sh | 1 - package.json | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 85f8efdec..b53ceb9df 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -64,6 +64,50 @@ jobs: run: yarn lint if: success() + lint-sh: + name: Lint shell files + runs-on: ubuntu-latest + timeout-minutes: 5 + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v23.2 + with: + files: | + **.sh + **.bats + + - name: Install Node.js v16 + if: steps.changed-files.outputs.any_changed == 'true' + uses: actions/setup-node@v3 + with: + node-version: "16" + + - name: Fetch dependencies from cache + if: steps.changed-files.outputs.any_changed == 'true' + id: cache-yarn + uses: actions/cache@v3 + with: + path: "node_modules" + key: yarn-build-${{ hashFiles('yarn.lock') }} + restore-keys: | + yarn-build- + + - name: Install dependencies + if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true' + run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile + + - name: Lint shell files + if: steps.changed-files.outputs.any_changed == 'true' + run: yarn lint:sh + + - name: Fail workflow + if: failure() + uses: andymckay/cancel-action@0.2 + build: name: Build needs: prebuild diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh index 036ec1190..ac6be75ce 100755 --- a/ci/dev/lint.sh +++ b/ci/dev/lint.sh @@ -6,7 +6,6 @@ main() { eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "lib/vscode") tsc --noEmit --skipLibCheck - shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh" | grep -v "lib/vscode") if command -v helm && helm kubeval --help > /dev/null; then helm kubeval ci/helm-chart fi diff --git a/package.json b/package.json index 683bd50f7..4a2c64add 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "_audit": "./ci/dev/audit.sh", "fmt": "./ci/dev/fmt.sh", "lint": "./ci/dev/lint.sh", + "lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')", "test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1", "ci": "./ci/dev/ci.sh", "watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts",