This is an automated email from the ASF dual-hosted git repository.
justxuewei pushed a commit to branch release-3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/release-3.0 by this push:
new 5735c8547 ci: Clone from target branch (#2469)
5735c8547 is described below
commit 5735c85477d5936f9ad0a99c62f8a34b955ab29a
Author: Xuewei Niu <[email protected]>
AuthorDate: Sat Oct 28 17:58:29 2023 +0800
ci: Clone from target branch (#2469)
We are maintaining several branches at this time, e.g. release-3.0 and
main. However, cloning dubbo-go-samples for integrate testing is still from
master. This leads to CI failure on old branch, like release-3.0, when the
master branch have received some breaking changes. Therefore, the
dubbo-go-samples' branch is required to keep same as the target branch.
Signed-off-by: Xuewei Niu <[email protected]>
---
.github/workflows/github-actions.yml | 5 +++--
integrate_test.sh | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/github-actions.yml
b/.github/workflows/github-actions.yml
index 74933f9aa..6fe4a8515 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -2,7 +2,9 @@ name: CI
on:
push:
- branches: "*"
+ branches:
+ - main
+ - 'release-*'
pull_request:
branches: "*"
@@ -66,7 +68,6 @@ jobs:
- name: Format code
run: |
go fmt ./... && git status && [[ -z `git status -s` ]]
- # diff -u <(echo -n) <(gofmt -d -s .)
- name: Verify
run: |
diff --git a/integrate_test.sh b/integrate_test.sh
index f8ca76942..a0f88a076 100644
--- a/integrate_test.sh
+++ b/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 master https://github.com/apache/dubbo-go-samples.git samples &&
cd samples
+git clone -b $3 https://github.com/apache/dubbo-go-samples.git samples && cd
samples
# update dubbo-go to current commit id
go mod edit -replace=dubbo.apache.org/dubbo-go/v3=github.com/"$1"/v3@"$2"
