From 8eabdcbea0f8fea7a5ba8aff9b3c82999ef46888 Mon Sep 17 00:00:00 2001
From: Yuqian Li <liyuqian@google.com>
Date: Fri, 27 Jul 2018 21:41:23 -0700
Subject: [PATCH 1/3] Try container

---
 .cirrus.yml | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8e1be2de95c15..223bbd01b7453 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,27 +1,45 @@
-gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
+container:
+  image: liyuqian79/flutter_engine:base
 
-gce_instance:
-  image_project: flutter-cirrus
-  image_name: flutter-engine-ubuntu1604
-  zone: us-central1-a
-  cpu: 24
-  memory: 32Gb
-  disk: 60
-
-build_android_task:
+build_host_task:
   env:
     CIRRUS_WORKING_DIR: "/tmp/github_repo"
-    ENGINE_PATH: "/var/tmp/flutter/engine"
-    PATH: $PATH:/var/tmp/depot_tools
 
   replace_engine_script: |
     cd $ENGINE_PATH/src
     rm -r flutter
-    cp $CIRRUS_WORKING_DIR -r ./flutter
+    mv $CIRRUS_WORKING_DIR flutter
     gclient sync
 
-  compile_android_script: |
+  compile_host_script: |
     cd $ENGINE_PATH/src
-    ./flutter/tools/gn --android --unoptimized
-    ninja -C out/android_debug_unopt
+    ./flutter/tools/gn --unoptimized
+    ninja -C out/host_debug_unopt
+
+#gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
+#
+#gce_instance:
+#  image_project: flutter-cirrus
+#  image_name: flutter-engine-ubuntu1604
+#  zone: us-central1-a
+#  cpu: 24
+#  memory: 32Gb
+#  disk: 60
+#
+#build_android_task:
+#  env:
+#    CIRRUS_WORKING_DIR: "/tmp/github_repo"
+#    ENGINE_PATH: "/var/tmp/flutter/engine"
+#    PATH: $PATH:/var/tmp/depot_tools
+#
+#  replace_engine_script: |
+#    cd $ENGINE_PATH/src
+#    rm -r flutter
+#    cp $CIRRUS_WORKING_DIR -r ./flutter
+#    gclient sync
+#
+#  compile_android_script: |
+#    cd $ENGINE_PATH/src
+#    ./flutter/tools/gn --android --unoptimized
+#    ninja -C out/android_debug_unopt
 

From 0da889d87544deece7d39a5fb14e7ae7b4d8051d Mon Sep 17 00:00:00 2001
From: Yuqian Li <liyuqian@google.com>
Date: Fri, 27 Jul 2018 23:38:30 -0700
Subject: [PATCH 2/3] Build both host and android

---
 .cirrus.yml | 46 +++++++++++++---------------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 223bbd01b7453..7d341b72c7b82 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 container:
-  image: liyuqian79/flutter_engine:base
+  image: gcr.io/flutter-cirrus/build-engine-image:0.1
 
-build_host_task:
+task:
   env:
     CIRRUS_WORKING_DIR: "/tmp/github_repo"
 
@@ -11,35 +11,15 @@ build_host_task:
     mv $CIRRUS_WORKING_DIR flutter
     gclient sync
 
-  compile_host_script: |
-    cd $ENGINE_PATH/src
-    ./flutter/tools/gn --unoptimized
-    ninja -C out/host_debug_unopt
-
-#gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
-#
-#gce_instance:
-#  image_project: flutter-cirrus
-#  image_name: flutter-engine-ubuntu1604
-#  zone: us-central1-a
-#  cpu: 24
-#  memory: 32Gb
-#  disk: 60
-#
-#build_android_task:
-#  env:
-#    CIRRUS_WORKING_DIR: "/tmp/github_repo"
-#    ENGINE_PATH: "/var/tmp/flutter/engine"
-#    PATH: $PATH:/var/tmp/depot_tools
-#
-#  replace_engine_script: |
-#    cd $ENGINE_PATH/src
-#    rm -r flutter
-#    cp $CIRRUS_WORKING_DIR -r ./flutter
-#    gclient sync
-#
-#  compile_android_script: |
-#    cd $ENGINE_PATH/src
-#    ./flutter/tools/gn --android --unoptimized
-#    ninja -C out/android_debug_unopt
+  matrix:
+    - name: build_host
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --unoptimized
+        ninja -C out/host_debug_unopt
+    - name: build_android
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --android --unoptimized
+        ninja -C out/android_debug_unopt
 

From 5f3a36ccd3cf27e0ab70dd33c3abe9d4f02e8a07 Mon Sep 17 00:00:00 2001
From: Yuqian Li <liyuqian@google.com>
Date: Sat, 28 Jul 2018 09:37:38 -0700
Subject: [PATCH 3/3] Try GKE

---
 .cirrus.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7d341b72c7b82..d4121214c81d1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,5 +1,12 @@
-container:
-  image: gcr.io/flutter-cirrus/build-engine-image:0.1
+gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
+
+gke_container:
+ image: gcr.io/flutter-cirrus/build-engine-image:latest
+ cluster_name: build-32-cluster
+ zone: us-central1-a
+ namespace: default
+ cpu: 30 # can't use all 30-cores; system pods needs cores too
+ memory: 100Gb # similarly, can't use all 100Gb memory
 
 task:
   env: