Merge pull request #1068 from zouyx/feature/fixIntegration

Fix: integration test in Action
apache · Mar 6, 2021 · 5c7831a · 5c7831a
2 parents f1f81eb + b8c51a7
commit 5c7831a
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 1,872 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -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)

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/apache/dubbo-go
 
-go 1.13
+go 1.15
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1 // indirect

diff --git a/test/integrate/dubbo/go-client/Dockerfile b/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
diff --git a/test/integrate/dubbo/go-client/go.mod b/test/integrate/dubbo/go-client/go.mod
@@ -1,8 +1,3 @@
 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
diff --git a/test/integrate/dubbo/go-client/go.sum b/test/integrate/dubbo/go-client/go.sum
diff --git a/test/integrate/dubbo/go-server/Dockerfile b/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
diff --git a/test/integrate/dubbo/go-server/go.mod b/test/integrate/dubbo/go-server/go.mod
@@ -1,8 +1,3 @@
 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
diff --git a/test/integrate/dubbo/go-server/go.sum b/test/integrate/dubbo/go-server/go.sum