Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

use $CIRRUS_BASE_BRANCH for the branch name #18014

Merged
nturgut merged 1 commit into from
Apr 29, 2020
Merged

use $CIRRUS_BASE_BRANCH for the branch name #18014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/clone_flutter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fi
cd $ENGINE_PATH/src/flutter

# Special handling of release branches.
ENGINE_BRANCH_NAME=`git branch | grep '*' | cut -d ' ' -f2`
ENGINE_BRANCH_NAME=$CIRRUS_BASE_BRANCH
Copy link
Contributor

@yjbanov yjbanov Apr 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this variable? Can we just use CIRRUS_BASE_BRANCH?

Copy link
Contributor Author

@nturgut nturgut Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

@yjbanov yjbanov Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor Author

@nturgut nturgut Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

versionregex="^v[[:digit:]]+\."
releasecandidateregex="^flutter-[[:digit:]]+\.[[:digit:]]+-candidate\.[[:digit:]]+$"
ON_RELEASE_BRANCH=false
Expand Down