From 571fb0dcbd6457482b4a10809e5220611c0d9357 Mon Sep 17 00:00:00 2001 From: mazhihui Date: Sun, 23 Oct 2022 11:32:07 +0800 Subject: [PATCH 1/4] fix sample url using https://github.com/apache/dubbo-go-pixiu-samples.git --- start_integrate_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_integrate_test.sh b/start_integrate_test.sh index 46dea1c91..af223c546 100755 --- a/start_integrate_test.sh +++ b/start_integrate_test.sh @@ -36,7 +36,7 @@ echo "github pull request base branch -> $3" echo "github pull request head branch -> ${GITHUB_HEAD_REF}" echo "use dubbo-go-samples $3 branch for integration testing" -git clone -b main https://github.com/dubbo-go-pixiu/samples.git integrate_samples && cd integrate_samples +git clone -b main https://github.com/apache/dubbo-go-pixiu-samples.git integrate_samples && cd integrate_samples # update dubbo-go to current commit id go mod edit -replace=github.com/apache/dubbo-go-pixiu=github.com/"$1"@"$2" From 4a5017f80517c252d51c548a6e9e0c4f6a6368b6 Mon Sep 17 00:00:00 2001 From: mazhihui Date: Sun, 23 Oct 2022 14:12:32 +0800 Subject: [PATCH 2/4] donot replace pixiu/pkg --- start_integrate_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_integrate_test.sh b/start_integrate_test.sh index af223c546..81bc4fcec 100755 --- a/start_integrate_test.sh +++ b/start_integrate_test.sh @@ -41,7 +41,7 @@ git clone -b main https://github.com/apache/dubbo-go-pixiu-samples.git integrate # update dubbo-go to current commit id go mod edit -replace=github.com/apache/dubbo-go-pixiu=github.com/"$1"@"$2" -grep -rl "github.com/apache/dubbo-go-pixiu/pkg" | xargs sed -i 's/github.com\/apache\/dubbo-go-pixiu\/pkg\//github.com\/apache\/dubbo-go-pixiu\/pixiu\/pkg\//g' +#grep -rl "github.com/apache/dubbo-go-pixiu/pkg" | xargs sed -i 's/github.com\/apache\/dubbo-go-pixiu\/pkg\//github.com\/apache\/dubbo-go-pixiu\/pixiu\/pkg\//g' # prepare dependency go mod tidy From 9bd6a7732a70466d7c50e4fb3665c689a4611793 Mon Sep 17 00:00:00 2001 From: mazhihui Date: Sun, 30 Oct 2022 16:13:36 +0800 Subject: [PATCH 3/4] samples always run under dubbo-go-pixiu/integrate_test --- start_integrate_test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/start_integrate_test.sh b/start_integrate_test.sh index 81bc4fcec..7d23e2e16 100755 --- a/start_integrate_test.sh +++ b/start_integrate_test.sh @@ -41,6 +41,9 @@ git clone -b main https://github.com/apache/dubbo-go-pixiu-samples.git integrate # update dubbo-go to current commit id go mod edit -replace=github.com/apache/dubbo-go-pixiu=github.com/"$1"@"$2" +# use parent dir as dubbo-go-pixiu because it's easy for running integrate test locally. +go mod edit -replace=github.com/apache/dubbo-go-pixiu=.. + #grep -rl "github.com/apache/dubbo-go-pixiu/pkg" | xargs sed -i 's/github.com\/apache\/dubbo-go-pixiu\/pkg\//github.com\/apache\/dubbo-go-pixiu\/pixiu\/pkg\//g' # prepare dependency From d9a7a0f8d7585972812357fffe1b9d44f3e1c6d9 Mon Sep 17 00:00:00 2001 From: mazhihui Date: Sun, 30 Oct 2022 16:26:01 +0800 Subject: [PATCH 4/4] fix CI issue --- start_integrate_test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/start_integrate_test.sh b/start_integrate_test.sh index 7d23e2e16..81bc4fcec 100755 --- a/start_integrate_test.sh +++ b/start_integrate_test.sh @@ -41,9 +41,6 @@ git clone -b main https://github.com/apache/dubbo-go-pixiu-samples.git integrate # update dubbo-go to current commit id go mod edit -replace=github.com/apache/dubbo-go-pixiu=github.com/"$1"@"$2" -# use parent dir as dubbo-go-pixiu because it's easy for running integrate test locally. -go mod edit -replace=github.com/apache/dubbo-go-pixiu=.. - #grep -rl "github.com/apache/dubbo-go-pixiu/pkg" | xargs sed -i 's/github.com\/apache\/dubbo-go-pixiu\/pkg\//github.com\/apache\/dubbo-go-pixiu\/pixiu\/pkg\//g' # prepare dependency