diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 48759b08..461eed17 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -7,32 +7,50 @@ on: branches: [ master ] jobs: - build: - name: Build + test-linux: + name: Linux runs-on: ubuntu-latest steps: + - name: Set up Go 1.x + uses: actions/setup-go@v2 + with: + go-version: ^1.15 + id: go - - name: Set up Go 1.x - uses: actions/setup-go@v2 - with: - go-version: ^1.15 - id: go + - name: Check out code into the Go module directory + uses: actions/checkout@v2 - - name: Check out code into the Go module directory - uses: actions/checkout@v2 + - name: Get dependencies + run: | + go get -v -t -d ./... - - name: Get dependencies - run: | - go get -v -t -d ./... + - name: Lint + run: | + go vet -stdmethods=false $(go list ./...) + go install mvdan.cc/gofumpt@latest + test -z "$(gofumpt -s -l -extra .)" || echo "Please run 'gofumpt -l -w -extra .'" - - name: Lint - run: | - go vet -stdmethods=false $(go list ./...) - go install mvdan.cc/gofumpt@latest - test -z "$(gofumpt -s -l -extra .)" || echo "Please run 'gofumpt -l -w -extra .'" + - name: Test + run: go test -race -coverprofile=coverage.txt -covermode=atomic ./... - - name: Test - run: go test -race -coverprofile=coverage.txt -covermode=atomic ./... + - name: Codecov + uses: codecov/codecov-action@v2 - - name: Codecov - uses: codecov/codecov-action@v2 + test-win: + name: Windows + runs-on: windows-latest + steps: + - name: Set up Go 1.x + uses: actions/setup-go@v2 + with: + go-version: ^1.15 + + - name: Checkout codebase + uses: actions/checkout@v2 + + - name: Test + run: | + go mod verify + go mod download + go test -v -race ./... + cd tools/goctl && go build -v goctl.go diff --git a/core/proc/shutdown_test.go b/core/proc/shutdown_test.go index 3a0abcfd..415e09e5 100644 --- a/core/proc/shutdown_test.go +++ b/core/proc/shutdown_test.go @@ -1,3 +1,6 @@ +//go:build linux || darwin +// +build linux darwin + package proc import ( diff --git a/core/stores/redis/redis_test.go b/core/stores/redis/redis_test.go index 92612654..ee50c2e0 100644 --- a/core/stores/redis/redis_test.go +++ b/core/stores/redis/redis_test.go @@ -11,6 +11,7 @@ import ( "github.com/alicebob/miniredis/v2" red "github.com/go-redis/redis" "github.com/stretchr/testify/assert" + "github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -1135,6 +1136,8 @@ func TestRedis_WithPass(t *testing.T) { } func runOnRedis(t *testing.T, fn func(client *Redis)) { + logx.Disable() + s, err := miniredis.Run() assert.Nil(t, err) defer func() { @@ -1153,6 +1156,8 @@ func runOnRedis(t *testing.T, fn func(client *Redis)) { } func runOnRedisTLS(t *testing.T, fn func(client *Redis)) { + logx.Disable() + s, err := miniredis.RunTLS(&tls.Config{ Certificates: make([]tls.Certificate, 1), InsecureSkipVerify: true, diff --git a/core/stores/redis/scriptcache_test.go b/core/stores/redis/scriptcache_test.go index 22f6051a..e4e5484c 100644 --- a/core/stores/redis/scriptcache_test.go +++ b/core/stores/redis/scriptcache_test.go @@ -4,9 +4,12 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/zeromicro/go-zero/core/logx" ) func TestScriptCache(t *testing.T) { + logx.Disable() + cache := GetScriptCache() cache.SetSha("foo", "bar") cache.SetSha("bla", "blabla")