Merge pull request #1068 from zouyx/feature/fixIntegration

Fix: integration test in Action

.github/workflows/github-actions.yml

@@ -56,7 +56,7 @@ jobs:
 
     - name: gofmt
       run: |
-        go fmt ./... && git checkout -- go.mod && git status && [[ -z `git status -s` ]]
+        go fmt ./... && git status && [[ -z `git status -s` ]]
         # diff -u <(echo -n) <(gofmt -d -s .)
 
     - name: Install go ci lint
@@ -69,9 +69,9 @@ jobs:
       run: |
         make verify
 
-#    - name: Integrate Test
-#      run: |
-#        chmod +x integrate_test.sh && ./integrate_test.sh ${{github.event.pull_request.head.repo.full_name}} ${{github.event.pull_request.head.sha}}
+    - name: Integrate Test
+      run: |
+        chmod +x integrate_test.sh && ./integrate_test.sh ${{github.event.pull_request.head.repo.full_name}} ${{github.event.pull_request.head.sha}}
 
     - name: Post Coverage
       run: bash <(curl -s https://codecov.io/bash)

README.md

@@ -177,7 +177,7 @@ If you are willing to do some code contributions and document contributions to [
 
 ## Community
 
-If u want to communicate with our community, pls scan the following  [dubbobo Ding-Ding QR code](https://mmbiz.qpic.cn/mmbiz_jpg/yvBJb5IiafvnHVBdtia30dxA2hKotr9DEckWsZ7aOJcDWDaSVMGwLmYv8GRgIQtqb4C2svicp8nVkMmGy7yKC5tyA/640?wx_fmt=jpeg&tp=webp&wxfrom=5&wx_lazy=1&wx_co=1) or search our commnity DingDing group code 31363295.
+If u want to communicate with our community, pls scan the following dubbobo Ding-Ding QR code or search our commnity DingDing group code 31363295.
 
 <div>
 <table>

go.mod

 module github.com/apache/dubbo-go
 
-go 1.13
+go 1.15
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1 // indirect

test/integrate/dubbo/go-client/Dockerfile

@@ -33,6 +33,6 @@ RUN test ${PR_ORIGIN_REPO} && go mod edit  -replace=github.com/apache/dubbo-go=g
 
 ENV GO111MODULE on
 
-RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-client
+RUN go mod tidy && go install github.com/apache/dubbo-go/test/integrate/dubbo/go-client
 
 CMD go-client
\ No newline at end of file

test/integrate/dubbo/go-client/go.mod

 module github.com/apache/dubbo-go/test/integrate/dubbo/go-client
 
-require (
-	github.com/apache/dubbo-go v1.5.6-rc1.0.20210220143153-9c8fc77f0381
-	github.com/apache/dubbo-go-hessian2 v1.8.2
-)
-
 go 1.13

test/integrate/dubbo/go-server/Dockerfile

@@ -32,6 +32,6 @@ RUN test ${PR_ORIGIN_REPO} && go mod edit  -replace=github.com/apache/dubbo-go=g
 
 ENV GO111MODULE on
 
-RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-server
+RUN go mod tidy && go install github.com/apache/dubbo-go/test/integrate/dubbo/go-server
 
 CMD go-server

test/integrate/dubbo/go-server/go.mod

 module github.com/apache/dubbo-go/test/integrate/dubbo/go-server
 
-require (
-	github.com/apache/dubbo-go v1.5.6-rc1.0.20210220143153-9c8fc77f0381
-	github.com/apache/dubbo-go-hessian2 v1.8.2
-)
-
 go 1.13