Skip to content

Commit

Permalink
ci: Clone from target branch
Browse files Browse the repository at this point in the history
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 <justxuewei@apache.org>
  • Loading branch information
justxuewei committed Oct 28, 2023
1 parent cccb67d commit e89025b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: CI

on:
push:
branches: "*"
branches:
- main
- 'release-*'
pull_request:
branches: "*"

Expand Down
2 changes: 1 addition & 1 deletion integrate_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit e89025b

Please sign in to comment.