use $CIRRUS_BASE_BRANCH for the branch name #18014
Conversation
use $CIRRUS_BASE_BRANCH for getting the branch name when cloning the flutter repo.
|
|
||
| # Special handling of release branches. | ||
| ENGINE_BRANCH_NAME=`git branch | grep '*' | cut -d ' ' -f2` | ||
| ENGINE_BRANCH_NAME=$CIRRUS_BASE_BRANCH |
There was a problem hiding this comment.
Why do we need this variable? Can we just use CIRRUS_BASE_BRANCH?
There was a problem hiding this comment.
In summary when we wrote clone_flutter.sh script, we though git branch will fetch the corresponding branch name and we will change the branch if, test is running on a release branch. however we didn't see it in actions since all tests so far was on master. with the new release we realize git branch return (no branch). That is why web integration tests were failing for the release. so I started using this cirrus ci parameter. I tested a few more variables such as $BRANCH $CIRRUS_BRANCH only this one returns the value we need.
There was a problem hiding this comment.
What I mean is if you remove this line then search and replace ENGINE_BRANCH_NAME with CIRRUS_BASE_BRANCH, wouldn't the result be the same?
There was a problem hiding this comment.
Yes, sorry I didn't get your question! as you will see I use ENGINE_BRANCH_NAME in a lot of places. I also think is a more descriptive variable name than CIRRUS_BRANCH_NAME. We can also keep ENGINE_BRANCH_NAME when we are using this script in LUCI too.
|
Merging the PR. Thanks for the review! |
use $CIRRUS_BASE_BRANCH for getting the branch name when cloning the flutter repo.
* use $CIRRUS_BASE_BRANCH for the branch name (#18014) use $CIRRUS_BASE_BRANCH for getting the branch name when cloning the flutter repo. * Change the repo fetch script used in integration tests (#17943) * change the repo fetch script to recognize candidate versions such as flutter-1.17-candidate.3. Originally the script only accepted branches such as v0.7.3 as valid engine branches. * addressing reviewer comments: changing the release regular expression Co-authored-by: Nurhan Turgut <[email protected]>
3 participants
use $CIRRUS_BASE_BRANCH for getting the branch name when cloning the flutter repo.
Successful run for the failing integration test: https://cirrus-ci.com/task/6347234272870400
Fixes flutter/flutter#55884