From ecddce42df574fc971510c2fd70c545ddebd9dfd Mon Sep 17 00:00:00 2001 From: ashing Date: Thu, 30 Nov 2023 00:42:01 +0800 Subject: [PATCH 1/2] ci: add lint check Signed-off-by: ashing --- .github/workflows/lint.yaml | 45 +++++++++++++++++++++++++++++++++++++ .golangci.yml | 3 +++ Makefile | 3 +++ 3 files changed, 51 insertions(+) create mode 100644 .github/workflows/lint.yaml create mode 100644 .golangci.yml create mode 100644 Makefile diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 0000000..84ddccf --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,45 @@ +name: Lint Check + +on: + push: + branches: + - main + pull_request: + branches: + - main + +permissions: read-all +jobs: + gofmt: + runs-on: ubuntu-latest + timeout-minutes: 5 + steps: + - uses: actions/checkout@v3 + - name: Setup Go Environment + uses: actions/setup-go@v3 + with: + go-version: '1.21.3' + - name: Run gofmt Check + working-directory: ./ + run: | + diffs=`gofmt -l .` + if [[ -n $diffs ]]; then + echo "Files are not formatted by gofmt:" + echo $diffs + exit 1 + fi + golint: + runs-on: ubuntu-latest + timeout-minutes: 10 + steps: + - uses: actions/checkout@v3 + - name: Setup Go Environment + uses: actions/setup-go@v3 + with: + go-version: '1.21.3' + - name: Download golangci-lint + run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.1 + - name: Run Golang Linters + working-directory: ./ + run: | + PATH=${PATH}:$(go env GOPATH)/bin make lint diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..4c44c5f --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,3 @@ +linters: + disable: + - errcheck diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..679678a --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +lint: ## Apply go lint check + @golangci-lint run --timeout 10m ./... +.PHONY: lint From e0ef684b7f83cf740db05cc861127be5f156df9c Mon Sep 17 00:00:00 2001 From: ashing Date: Thu, 30 Nov 2023 00:47:41 +0800 Subject: [PATCH 2/2] fix: go fmt Signed-off-by: ashing --- send/wechatBot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/send/wechatBot.go b/send/wechatBot.go index 52f8054..da57bc2 100644 --- a/send/wechatBot.go +++ b/send/wechatBot.go @@ -31,7 +31,7 @@ func (w *wechatBot) send(msg *message) error { return fmt.Errorf("sender type %s does not support simple type %s", w.conf["type"], msg.MsgType) } } - + if len(msg.Ats) > 0 { switch msg.MsgType { case simpleText: