merge main to develop (#20)

tronprotocol · Jan 24, 2025 · 53afb26 · 53afb26
1 parent 9cb4772
commit 53afb26
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 295 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -4,7 +4,7 @@ run-name: Lint sources
 on:
   push:
   pull_request:
-    branches: [main, develop]
+    branches: [main, develop, release_*]
 
 jobs:
   lint:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,17 +8,18 @@ repos:
       - id: check-yaml
       - id: double-quote-string-fixer
       - id: check-shebang-scripts-are-executable
-        exclude: tools/docker/docker.sh
       - id: check-executables-have-shebangs
       - id: detect-private-key
   - repo: 'https://github.com/jumanjihouse/pre-commit-hooks'
     rev: 3.0.0
     hooks:
-      - id: shellcheck
-        exclude: tools/docker/docker.sh
       - id: script-must-have-extension
       - id: git-dirty
       - id: git-check
+  - repo: 'https://github.com/koalaman/shellcheck-precommit'
+    rev: v0.7.2
+    hooks:
+      - id: shellcheck
   - repo: local # check java files format use a customized script
     hooks:
       - id: checkstyle

diff --git a/tools/docker/docker.sh b/tools/docker/docker.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ run-name: Lint sources @@
     on:
       push:
       pull_request:
-        branches: [main, develop]
+        branches: [main, develop, release_*]
     jobs:
       lint:
@@ Expand Down @@