This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/3.0 by this push:
new ceac0d6 fix merge (#1197)
ceac0d6 is described below
commit ceac0d6f44b18d6e288eb5de522fccf5270de7bc
Author: Mulavar <[email protected]>
AuthorDate: Mon May 10 20:13:56 2021 +0800
fix merge (#1197)
Co-authored-by: dongjianhui <[email protected]>
---
.github/workflows/github-actions.yml | 5 ++---
integrate_test.sh | 6 +++---
test/integrate/dubbo/go-client/Dockerfile | 12 ++++++++----
test/integrate/dubbo/go-server/Dockerfile | 14 +++++++++-----
4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/github-actions.yml
b/.github/workflows/github-actions.yml
index e1e2161..4e72a35 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -71,11 +71,10 @@ jobs:
- 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}}
+ chmod +x integrate_test.sh && [[ -n
"${{github.event.pull_request.head.repo.full_name}}" ]] && [[ -n
"${{github.event.pull_request.head.sha}}" ]] && ./integrate_test.sh
${{github.event.pull_request.head.repo.full_name}}
${{github.event.pull_request.head.sha}} || ./integrate_test.sh
$GITHUB_REPOSITORY $GITHUB_SHA
- name: Post Coverage
run: bash <(curl -s https://codecov.io/bash)
- name: Hello world
- run: echo Hello world ${{ secrets.DING_TOKEN }} ${{ secrets.DING_SIGN }}
-
+ run: echo Hello world ${{ secrets.DING_TOKEN }} ${{ secrets.DING_SIGN }}
\ No newline at end of file
diff --git a/integrate_test.sh b/integrate_test.sh
index e1bbc8c..ddd31de 100644
--- a/integrate_test.sh
+++ b/integrate_test.sh
@@ -53,14 +53,14 @@ echo "zookeeper listen in [:]2181"
# build go-server image
cd ./test/integrate/dubbo/go-server
-docker build . -t ci-provider --build-arg PR_ORIGIN_REPO=$1 --build-arg
PR_ORIGIN_COMMITID=$2
+docker build . -t ci-provider --build-arg REPO=$1 --build-arg COMMITID=$2
cd ${ROOT_DIR}
docker run -d --network host ci-provider
# build go-client image
cd ./test/integrate/dubbo/go-client
-docker build . -t ci-consumer --build-arg PR_ORIGIN_REPO=$1 --build-arg
PR_ORIGIN_COMMITID=$2
+docker build . -t ci-consumer --build-arg REPO=$1 --build-arg COMMITID=$2
cd ${ROOT_DIR}
# run provider
# check consumer status
-docker run -i --network host ci-consumer
+docker run -i --network host ci-consumer
\ No newline at end of file
diff --git a/test/integrate/dubbo/go-client/Dockerfile
b/test/integrate/dubbo/go-client/Dockerfile
index a928531..55734f5 100644
--- a/test/integrate/dubbo/go-client/Dockerfile
+++ b/test/integrate/dubbo/go-client/Dockerfile
@@ -22,14 +22,18 @@ WORKDIR
/go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client
ENV CONF_CONSUMER_FILE_PATH "client.yml"
ENV APP_LOG_CONF_FILE "log.yml"
-ARG PR_ORIGIN_REPO
-ARG PR_ORIGIN_COMMITID
+# for pull_request, it is pr origin repository
+# for merge int develop/master, it is github.com/apache/dubbo-go
+ARG REPO
+# for pull_request, it is pr origin commit id
+# for merge int develop/master, it is the commit id that trigger the ci
workflow
+ARG COMMITID
ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client
# update dubbo-go to current commit id
-RUN test ${PR_ORIGIN_REPO} && echo "dubbo.apache.org/dubbo-go/v3 will be
replace to github.com/${PR_ORIGIN_REPO}/v3@${PR_ORIGIN_COMMITID}" || echo 'go
get dubbo.apache.org/dubbo-go/v3@develop'
-RUN test ${PR_ORIGIN_REPO} && go mod edit
-replace=dubbo.apache.org/dubbo-go/v3=github.com/${PR_ORIGIN_REPO}/v3@${PR_ORIGIN_COMMITID}
|| go get dubbo.apache.org/dubbo-go/v3@develop
+RUN test ${REPO} && echo "dubbo.apache.org/dubbo-go/v3 will be replace to
github.com/${REPO}/v3@${COMMITID}"
+RUN test ${REPO} && go mod edit
-replace=dubbo.apache.org/dubbo-go/v3=github.com/${REPO}/v3@${COMMITID}
ENV GO111MODULE on
diff --git a/test/integrate/dubbo/go-server/Dockerfile
b/test/integrate/dubbo/go-server/Dockerfile
index dee29ed..08c34d2 100644
--- a/test/integrate/dubbo/go-server/Dockerfile
+++ b/test/integrate/dubbo/go-server/Dockerfile
@@ -22,16 +22,20 @@ WORKDIR
/go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-server
ENV CONF_PROVIDER_FILE_PATH "server.yml"
ENV APP_LOG_CONF_FILE "log.yml"
-ARG PR_ORIGIN_REPO
-ARG PR_ORIGIN_COMMITID
+# for pull_request, it is pr origin repository
+# for merge int develop/master, it is github.com/apache/dubbo-go
+ARG REPO
+# for pull_request, it is pr origin commit id
+# for merge int develop/master, it is the commit id that trigger the ci
workflow
+ARG COMMITID
ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-server
# update dubbo-go to current commit id
-RUN test ${PR_ORIGIN_REPO} && echo "dubbo.apache.org/dubbo-go/v3 will be
replace to github.com/${PR_ORIGIN_REPO}/v3@${PR_ORIGIN_COMMITID}" || echo 'go
get -u dubbo.apache.org/dubbo-go/v3@develop'
-RUN test ${PR_ORIGIN_REPO} && go mod edit
-replace=dubbo.apache.org/dubbo-go/v3=github.com/${PR_ORIGIN_REPO}/v3@${PR_ORIGIN_COMMITID}
|| go get -u dubbo.apache.org/dubbo-go/v3@develop
+RUN test ${REPO} && echo "dubbo.apache.org/dubbo-go/v3 will be replace to
github.com/${REPO}/v3@${COMMITID}"
+RUN test ${REPO} && go mod edit
-replace=dubbo.apache.org/dubbo-go/v3=github.com/${REPO}/v3@${COMMITID}
ENV GO111MODULE on
RUN go mod tidy && go install
github.com/apache/dubbo-go/test/integrate/dubbo/go-server
-CMD go-server
+CMD go-server
\ No newline at end of file
