Browse Source

ci(lint): enable linter for multiple modules (#1957)

* ci(lint): enable linter for multiple modules

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* fix: use tools/lint/bin/golangci-lint

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* fix(tfLite): nolint for typecheck

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* chore: checkout first

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* chore: optimize make syntax

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* chore: fix nolint scope

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* chore: remove nolint:typecheck

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* chore: skip tfLite

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

* fix: add nolint for labelImage

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>

---------

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>
Jason Lyu 1 năm trước cách đây
mục cha
commit
920e0cc4e9

+ 25 - 13
.github/workflows/lint.yaml

@@ -5,27 +5,22 @@ concurrency:
   cancel-in-progress: true
 
 on:
+  push:
   pull_request:
     types: [opened, edited, synchronize, reopened]
-    paths:
-      - '**.go'
-      - 'go.mod'
-      - 'go.sum'
-      - 'tools/check/.golangci.yaml'
-      - '.github/workflows/lint.yaml'
 
 jobs:
   check_licenses:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version: '1.20'
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
       - name: Check licenses
         run: |
           go install github.com/google/go-licenses@latest
@@ -36,14 +31,14 @@ jobs:
     needs:
       - check_licenses
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version: '1.20'
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
       - name: Install dependencies
         env:
           DEBIAN_FRONTEND: noninteractive
@@ -54,4 +49,21 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          args: --config tools/check/.golangci.yaml
+
+      - name: golangci-lint (extensions)
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          working-directory: extensions
+
+      - name: golangci-lint (tools/kubernetes)
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          working-directory: tools/kubernetes
+
+      - name: golangci-lint (sdk/go)
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          working-directory: sdk/go

+ 1 - 1
.gitignore

@@ -39,4 +39,4 @@ corss_build_for_rpm.tar
 */**/*.db
 
 .vscode/
-tools/check/bin/
+tools/lint/bin/

+ 1 - 0
tools/check/.golangci.yaml

@@ -2,6 +2,7 @@ run:
   timeout: 10m
   skip-dirs:
     - internal/plugin
+    - extensions/functions/tfLite
   build-tags:
     - edgex
 

+ 5 - 4
Makefile

@@ -143,9 +143,10 @@ tidy:
 	@echo "go mod tidy"
 	go mod tidy && git diff go.mod go.sum
 
-lint:tools/check/bin/golangci-lint
+lint:tools/lint/bin/golangci-lint
 	@echo "linting"
-	@tools/check/bin/golangci-lint run -c tools/check/.golangci.yaml ./...
+	tools/lint/bin/golangci-lint run ./... ./extensions/... ./tools/kubernetes/...
+	cd sdk/go && ../../tools/lint/bin/golangci-lint run
 
-tools/check/bin/golangci-lint:
-	GOBIN=$(shell pwd)/tools/check/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+tools/lint/bin/golangci-lint:
+	GOBIN=$(shell pwd)/tools/lint/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest

+ 1 - 1
extensions/functions/labelImage/labelImage.go

@@ -26,7 +26,7 @@ import (
 	"sort"
 	"sync"
 
-	tflite "github.com/mattn/go-tflite"
+	tflite "github.com/mattn/go-tflite" //nolint:typecheck
 	"github.com/nfnt/resize"
 
 	"github.com/lf-edge/ekuiper/pkg/api"