From 7b1df2e5960217e329a8edef5ef7dd2743713bf5 Mon Sep 17 00:00:00 2001 From: Nurhan Turgut Date: Fri, 24 Apr 2020 17:08:39 -0700 Subject: [PATCH] Change the repo fetch script used in integration tests (flutter/engine#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 --- engine/src/flutter/tools/clone_flutter.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/src/flutter/tools/clone_flutter.sh b/engine/src/flutter/tools/clone_flutter.sh index 48debdf4447..ffac82328f6 100755 --- a/engine/src/flutter/tools/clone_flutter.sh +++ b/engine/src/flutter/tools/clone_flutter.sh @@ -19,9 +19,10 @@ cd $ENGINE_PATH/src/flutter # Special handling of release branches. ENGINE_BRANCH_NAME=`git branch | grep '*' | cut -d ' ' -f2` versionregex="^v[[:digit:]]+\." +releasecandidateregex="^flutter-[[:digit:]]+\.[[:digit:]]+-candidate\.[[:digit:]]+$" ON_RELEASE_BRANCH=false echo "Engine on branch $ENGINE_BRANCH_NAME" -if [[ $ENGINE_BRANCH_NAME =~ $versionregex ]] +if [[ $ENGINE_BRANCH_NAME =~ $versionregex || $ENGINE_BRANCH_NAME =~ $releasecandidateregex ]] then echo "release branch $ENGINE_BRANCH_NAME" ON_RELEASE_BRANCH=true