Don't use 'flutter upgrade' on Cirrus (#4213)
This command isn't intended for CI use, and is also slower due to
downloading artifacts that will be immidately discarded.
Cirrus portion of https://github.com/flutter/flutter/issues/86037
diff --git a/.cirrus.yml b/.cirrus.yml
index 5e8425f..f978cc7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,8 +20,12 @@
- git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
- git fetch origin
# Switch to the requested branch.
- - flutter channel $CHANNEL
- - flutter upgrade
+ - git checkout $CHANNEL
+ # Reset to upstream branch, rather than using pull, since the base image
+ # can sometimes be in a state where it has diverged from upstream (!).
+ - git reset --hard @{u}
+ # Run doctor to allow auditing of what version of Flutter the run is using.
+ - flutter doctor -v
<< : *TOOL_SETUP_TEMPLATE
macos_template: &MACOS_TEMPLATE
