Revert "Allow rebuilding of docker image, re-enable deploy gallery ma…

…cos (flutter#43362)" (flutter#43557) This reverts commit 8e8d235.
andrewkolos · Oct 26, 2019 · 33873cf · 33873cf
1 parent 652fb97
commit 33873cf
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 417 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -22,7 +22,7 @@ environment:
 # LINUX SHARDS
 task:
   container:
-    dockerfile: "dev/ci/docker_linux/Dockerfile"
+    image: gcr.io/flutter-cirrus/build-flutter-image:latest
     cpu: $CPU
     memory: $MEMORY
   environment:
@@ -34,7 +34,6 @@ task:
     CPU: 1 # 0.1-8 without compute credits, 0.1-30 with (yes, you can go fractional)
     MEMORY: 4G # 256M-24G without compute credits, 256M-90G with
     CIRRUS_WORKING_DIR: "/tmp/$FLUTTER_SDK_PATH_WITH_SPACE"
-    CIRRUS_DOCKER_CONTEXT: "dev/ci/docker_linux"
     PATH: "$CIRRUS_WORKING_DIR/bin:$CIRRUS_WORKING_DIR/bin/cache/dart-sdk/bin:$PATH"
     ANDROID_SDK_ROOT: "/opt/android_sdk"
   pub_cache:
@@ -443,8 +442,8 @@ task:
   setup_script:
     - date
     - which flutter
-    - sudo gem install bundler -v 2.0.2 -N
-    - bundle install --system --gemfile=dev/ci/mac/Gemfile
+    - sudo gem install cocoapods
+    - sudo gem install xcpretty
     - git clean -xffd
     - git fetch origin
     - git fetch origin master # To set FETCH_HEAD, so that "git merge-base" works.
@@ -576,10 +575,7 @@ task:
         - ./dev/bots/deploy_gallery.sh
 
 docker_builder:
-  # Only build a new docker image when we tag a release (for dev, beta, or
-  # release.) Note: tagging a commit and pushing to a release branch are
-  # different cirrus triggers. See a tag CI run at e.g.
-  # https://cirrus-ci.com/github/flutter/flutter/v1.2.3
+  # Only build a new docker image when we tag a release (for dev, beta, or release.)
   only_if: $CIRRUS_TAG != ''
   environment:
     GCLOUD_CREDENTIALS: ENCRYPTED[f7c098d4dd7f5ee1bfee0bb7e944cce72efbe10e97ad6440ae72de4de6a1c24d23f421a2619c668e94377fb64b0bb3e6]
@@ -598,8 +594,7 @@ docker_builder:
     - hostonly_devicelab_tests-2-linux
     - hostonly_devicelab_tests-3_last-linux
     - firebase_test_lab_tests-linux
-  build_script:
-    - cd "$CIRRUS_WORKING_DIR/dev/ci/docker_linux"
-    - ./docker_build.sh
-    - ./docker_login.sh
-    - ./docker_push.sh
+  script:
+    - "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_build.sh"
+    - "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_login.sh"
+    - "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_push.sh"
diff --git a/.gitignore b/.gitignore
@@ -98,4 +98,3 @@ coverage/
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-!/dev/ci/**/Gemfile.lock
diff --git a/dev/bots/deploy_gallery.sh b/dev/bots/deploy_gallery.sh
@@ -99,7 +99,8 @@ elif [[ "$OS" == "darwin" ]]; then
       echo "Testing archiving with distribution profile..."
       (
         cd examples/flutter_gallery/ios
-        fastlane build_and_deploy_testflight
+        # TODO(fujino) re-enable after resolving https://github.com/flutter/flutter/issues/43204
+        #fastlane build_and_deploy_testflight
       )
       echo "(Not deploying; Flutter Gallery is only deployed to TestFlight for tagged dev branch commits.)"
     fi

diff --git a/dev/ci/docker_linux/Dockerfile b/dev/ci/docker_linux/Dockerfile
@@ -10,8 +10,6 @@
 # for performing pushes to production, and so this image is quite a bit larger
 # than strictly needed for just building Flutter apps.
 
-# Note: updating past stretch (Debian 9) will bump Java past version 8,
-# which will break the Android SDK.
 FROM debian:stretch
 MAINTAINER Flutter Developers <flutter-dev@googlegroups.com>
 
@@ -53,7 +51,7 @@ RUN bash "${NODEJS_INSTALL}/nodejs_install.sh"
 # Install the rest of the dependencies.
 RUN apt-get install -y --no-install-recommends \
   locales \
-  gcc \
+  golang \
   ruby \
   ruby-dev \
   nodejs \
@@ -110,24 +108,23 @@ RUN /usr/bin/npm --verbose install -g firebase-tools
 COPY patch_firebase.sh /root/patch_firebase.sh
 RUN /root/patch_firebase.sh
 
-# Install golang more recent than in repo (necessary for dashing to build)
-RUN curl 'https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz' | tar xvz
-ENV GOBINARY=/go/bin/go
-
 # Install dashing
+# This is why we need golang installed.
 RUN mkdir -p /opt/gopath/bin
 ENV GOPATH=/opt/gopath
 ENV PATH="${GOPATH}/bin:${PATH}"
-RUN $GOBINARY get -u github.com/technosophos/dashing
+RUN go get -u github.com/technosophos/dashing
 
 # Set locale to en_US
 RUN locale-gen en_US "en_US.UTF-8" && dpkg-reconfigure locales
 ENV LANG en_US.UTF-8
 
+# Install coveralls and Firebase
+# This is why we need ruby installed.
 # Skip all the documentation (-N) since it's just on CI.
+RUN gem install coveralls -N
 RUN gem install bundler -N
+# Install fastlane which is used on Linux to build and deploy Android
+# builds to the Play Store.
+RUN gem install fastlane -N
 
-COPY Gemfile /Gemfile
-COPY Gemfile.lock /Gemfile.lock
-
-RUN bundle install --system
diff --git a/dev/ci/docker_linux/Gemfile b/dev/ci/docker_linux/Gemfile
diff --git a/dev/ci/docker_linux/Gemfile.lock b/dev/ci/docker_linux/Gemfile.lock
diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile