Merge branch 'master' of github.com:baxiang/kratos

.github/workflows/go.yml

@@ -9,24 +9,106 @@ on:
 jobs:
 
   build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
+    name: Build on ${{ matrix.os }} - Go${{ matrix.go_version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go_version:
+          - 1.13
+        os:
+          - ubuntu-latest
 
-    - name: Set up Go 1.13
+    steps:
+  
+    - name: Set up Go ${{ matrix.go_version }}
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: ${{ matrix.go_version }}
       id: go
 
-    - name: Set up Env
-      run: |
-        echo "::set-env name=GOPATH::$(go env GOPATH)"
-        echo "::add-path::$(go env GOPATH)/bin"
-
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        # Cache
+        path: ~/go/pkg/mod
+        # Cache key
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
+        restore-keys: |
+          ${{ runner.os }}-go-
+
+    - name: Get dependencies
+      run: |
+        go get -v -t -d ./...
+        if [ -f Gopkg.toml ]; then
+            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+            dep ensure
+        fi
+
+    - name: Build
+      run: go build ./...
+
+    - name: Test
+      run: go test ./... -coverprofile=coverage.txt -covermode=atomic
+    
+    - name: Coverage
+      run: bash <(curl -s https://codecov.io/bash)
+
+  scaffold:
+  
+    name: Scaffold Test on ${{ matrix.os }} - Go${{ matrix.go_version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go_version:
+          - 1.13
+        os:
+          - ubuntu-latest
+  
+    steps:
+
+    - name: Set up Go ${{ matrix.go_version }}
+      uses: actions/setup-go@v1
+      with:
+        go-version: ${{ matrix.go_version }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        # Cache
+        path: ~/go/pkg/mod
+        # Cache key
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
+        restore-keys: |
+          ${{ runner.os }}-go-
+
+    - name: Set up Env
+      run: |
+        echo "::set-env name=GOPATH::$(go env GOPATH)"
+        echo "::add-path::$(go env GOPATH)/bin"
+  
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        # Cache
+        path: ~/go/pkg/mod
+        # Cache key
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
+        restore-keys: |
+          ${{ runner.os }}-go-
+
     - name: Get dependencies
       run: |
         go get -v -t -d ./...
@@ -34,10 +116,6 @@ jobs:
             curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
             dep ensure
         fi
-        sudo rm /usr/local/bin/docker-compose
-        curl -L https://github.com/docker/compose/releases/download/1.25.5/docker-compose-`uname -s`-`uname -m` > docker-compose
-        chmod +x docker-compose
-        sudo mv docker-compose /usr/local/bin
         wget https://github.com/google/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip
         unzip protoc-3.11.4-linux-x86_64.zip
         chmod +x bin/protoc
@@ -46,10 +124,6 @@ jobs:
         go get -u github.com/golang/protobuf/protoc-gen-go
         go get -u github.com/gogo/protobuf/protoc-gen-gofast
 
-    - name: Build
-      run: go build ./...
-    - name: Test
-      run: go test ./...
     - name: Tool
       run: |
         go install ./...

docs/breaker.md

@@ -14,7 +14,7 @@
  //初始化熔断器组
  //一组熔断器公用同一个配置项，可从分组内取出单个熔断器使用。可用在比如mysql主从分离等场景。
  brkGroup := breaker.NewGroup(&breaker.Config{}) 
- //为每一个连接指定一个brekaker
+ //为每一个连接指定一个breaker
  //此处假设一个客户端连接对象实例为conn
  //breakName定义熔断器名称 一般可以使用连接地址
  breakName = conn.Addr
@@ -25,7 +25,7 @@
 		return
   }
  
- //连接执行成功或失败将结果告知braker
+ //连接执行成功或失败将结果告知breaker
  if(respErr != nil){
       conn.breaker.MarkFailed()
  }else{

docs/ut-testcli.md

@@ -149,3 +149,4 @@ func TestMain(m *testing.M) {
 ## 注意
 因为启动mysql容器较为缓慢，健康检测的机制会重试3次，每次暂留5秒钟，基本在10s内mysql就能从creating到服务正常启动！
 当然你也可以在使用 testcli 时加上 --nodown，使其不用每次跑都新建容器，只在第一次跑的时候会初始化容器，后面都进行复用，这样速度会快很多。
+

tool/testcli/README.md

@@ -151,4 +151,4 @@ func TestMain(m *testing.M) {
 
 当然你也可以在使用 testcli 时加上 --nodown，使其不用每次跑都新建容器，只在第一次跑的时候会初始化容器，后面都进行复用，这样速度会快很多。
 
-成功启动后就欢乐奔放的玩耍吧～ Good Lucky!
+成功启动后就欢乐奔放的玩耍吧～ Good Luck!