summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbouzar Parvan <[email protected]>2021-08-17 12:07:11 +0430
committerGitHub <[email protected]>2021-08-17 07:37:11 +0000
commit1cc2452eb7b76aad36a6d9d210abff88edf6721a (patch)
tree73327aecc065e55d51bfaca3a589542e56b7ac77
parentc76cc0ea8ae793b4feb0c28407d0f0de104aef43 (diff)
[Bugfix] ignore jdtls to fix `CI` (#1339)
-rw-r--r--.github/workflows/format.yaml2
-rw-r--r--.github/workflows/lint.yaml1
-rw-r--r--.pre-commit-config.yaml6
3 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index 5f9db8cb..142ba7f1 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -40,5 +40,5 @@ jobs:
# https://google.github.io/styleguide/shellguide.html
- name: Check formatting
run: |
- shfmt -i 2 -ci -l -d .
+ shfmt -f . | grep -v jdtls | xargs shfmt -i 2 -ci -l -d
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index f5aab0eb..d187f497 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -32,3 +32,4 @@ jobs:
uses: ludeeus/action-shellcheck@master
with:
scandir: './utils'
+ ignore: 'bin'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9172b0f1..8ecda3bd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,16 +5,16 @@ repos:
name: shfmt
minimum_pre_commit_version: 2.4.0
language: system
- entry: shfmt
- args: [-i=2, -ci, -w]
types: [shell]
+ entry: bash
+ args: [-c, "shfmt -f $(git rev-parse --show-toplevel) | grep -v jdtls | xargs shfmt -i=2 -ci -w"]
- id: shellcheck
name: shellcheck
language: system
types: [shell]
entry: bash
args:
- [-c, "shfmt -f $(git rev-parse --show-toplevel) | xargs shellcheck"]
+ [-c, "shfmt -f $(git rev-parse --show-toplevel) | grep -v jdtls | xargs shellcheck"]
- id: stylua
name: StyLua
language: rust