updated .cirrus.yml and .travis.yml

.cirrus.yml

@@ -46,9 +46,9 @@ task:
         - sdkmanager "system-images;android-$ANDROID_EMULATOR_API_LEVEL;$ANDROID_ABI"
         - (yes || true) | sdkmanager --licenses
       create_device_script:
-        echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$ANDROID_ABI"
+        echo no | avdmanager create avd --force -n test -k "system-images;android-$ANDROID_EMULATOR_API_LEVEL;$ANDROID_ABI"
       start_emulator_background_script:
-        $ANDROID_SDK_ROOT/emulator/emulator-headless -VERBOSE -avd TEST -no-audio -no-window
+        $ANDROID_SDK_ROOT/emulator/emulator-headless -verbose -avd test -no-audio -no-window
       pub_cache:
         folder: ~/.pub-cache
       wait_for_emulator_script:

.travis.yml

@@ -1,27 +1,23 @@
 language: dart
 
-env:
-  global:
-    - DARTSDK=./flutter/bin/cache/dart-sdk/bin
-    - DARTFMT=$DARTSDK/dartfmt
-    - FLUTTER=./flutter/bin/flutter
-    - FLUTTER_UP=../flutter/bin/flutter
-    - FLUTTER_GITHUB=https://github.com/flutter/flutter.git
-    - PACKAGES=packages
-    - ANDROID_API=30
-
 install:
+  - source ~/.zprofile
   - export HOMEBREW_NO_AUTO_UPDATE=1
   - brew install node
   - brew install libimobiledevice ideviceinstaller ios-deploy
   - brew install cocoapods || echo 'ignore exit(1)'
   - brew link --overwrite cocoapods
-  - git clone $FLUTTER_GITHUB -b stable --depth 1
+  - echo 'export FLUTTER_HOME=$HOME/flutter' >> ~/.zprofile
-  - $FLUTTER upgrade
+  - echo 'export PATH=$HOME/flutter:$HOME/flutter/bin/:$HOME/flutter/bin/cache/dart-sdk/bin:$PATH' >> ~/.zprofile
-  - $FLUTTER channel master
+  - source ~/.zprofile
-  - $FLUTTER upgrade
+  - git clone https://github.com/flutter/flutter.git $FLUTTER_HOME
-  - $FLUTTER doctor
+  - cd $FLUTTER_HOME
-  - $FLUTTER pub get
+  - git checkout beta
+  - git checkout stable
+  - flutter doctor
+  - flutter channel master
+  - flutter upgrade
+  - flutter doctor
 
 jobs:
   include: