From 379996f1069df40ba7aa3455d481d1f4b69e33bc Mon Sep 17 00:00:00 2001 From: fedor Date: Mon, 25 Jun 2018 12:44:23 -0400 Subject: [PATCH] Configured macOS builds on Cirrus CI plus use sharding for `flutter_plugin_tools` --- .cirrus.yml | 32 +++++++++++++++++++++++++++++--- .travis.yml | 18 +++++++++--------- script/incremental_build.sh | 4 ++-- script/plugin_tools.sh | 17 ----------------- 4 files changed, 40 insertions(+), 31 deletions(-) delete mode 100755 script/plugin_tools.sh diff --git a/.cirrus.yml b/.cirrus.yml index 9e16028cd016..3226ab523083 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,6 @@ -container: - image: cirrusci/flutter:latest - task: + container: + image: cirrusci/flutter:latest upgrade_script: - flutter channel master - flutter upgrade @@ -18,6 +17,33 @@ task: - name: analyze script: ./script/incremental_build.sh analyze - name: build-apks+java-test + env: + matrix: + PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" + PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2" script: - ./script/incremental_build.sh build-examples --apk - ./script/incremental_build.sh java-test # must come after apk build + +task: + name: build-ipas + osx_instance: + image: high-sierra-xcode-9.4 + env: + PATH: $PATH:/usr/local/bin + matrix: + PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" + PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2" + setup_script: + - brew update + - brew install libimobiledevice + - brew install ideviceinstaller + - brew install ios-deploy + - pod repo update + - git clone https://github.com/flutter/flutter.git + - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH + - flutter doctor + - pub global activate flutter_plugin_tools + build_script: + - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH + - ./script/incremental_build.sh build-examples --ipa diff --git a/.travis.yml b/.travis.yml index 9600935b1610..55ae6b9aefda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: - flutter doctor - pub global activate flutter_plugin_tools script: - - ./script/plugin_tools.sh analyze + - ./script/incremental_build.sh analyze # Job 2) Check format and run tests - os: linux env: @@ -42,8 +42,8 @@ matrix: - flutter doctor - pub global activate flutter_plugin_tools script: - - ./script/plugin_tools.sh format --travis --clang-format=clang-format-5.0 - - ./script/plugin_tools.sh test + - ./script/incremental_build.sh format --travis --clang-format=clang-format-5.0 + - ./script/incremental_build.sh test # Job 3.1) Build example APKs and run Java tests, shard 1/2 - os: linux env: @@ -65,8 +65,8 @@ matrix: - export ANDROID_HOME=`pwd`/android-sdk - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH script: - - ./script/plugin_tools.sh build-examples --apk - - ./script/plugin_tools.sh java-test # must come after apk build + - ./script/incremental_build.sh build-examples --apk + - ./script/incremental_build.sh java-test # must come after apk build # Job 3.2) Build example APKs and run Java tests, shard 2/2 - os: linux env: @@ -88,8 +88,8 @@ matrix: - export ANDROID_HOME=`pwd`/android-sdk - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH script: - - ./script/plugin_tools.sh build-examples --apk - - ./script/plugin_tools.sh java-test # must come after apk build + - ./script/incremental_build.sh build-examples --apk + - ./script/incremental_build.sh java-test # must come after apk build # Job 4.1) Build example IPAs, shard 1/2 - os: osx env: @@ -101,7 +101,7 @@ matrix: - ./script/before_build_ipas.sh - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH script: - - ./script/plugin_tools.sh build-examples --ipa + - ./script/incremental_build.sh build-examples --ipa # Job 4.2) Build example IPAs, shard 2/2 - os: osx env: @@ -113,7 +113,7 @@ matrix: - ./script/before_build_ipas.sh - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH script: - - ./script/plugin_tools.sh build-examples --ipa + - ./script/incremental_build.sh build-examples --ipa cache: directories: diff --git a/script/incremental_build.sh b/script/incremental_build.sh index d2d22435ea8a..788a24ce2d6b 100755 --- a/script/incremental_build.sh +++ b/script/incremental_build.sh @@ -6,7 +6,7 @@ BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) if [ "${BRANCH_NAME}" = "master" ]; then echo "Running for all packages" - pub global run flutter_plugin_tools "$@" + pub global run flutter_plugin_tools "$@" $PLUGIN_SHARDING else # Make sure there is up-to-date master. git fetch origin master @@ -27,7 +27,7 @@ else if [ "${FLUTTER_CHANGED_PACKAGES}" = "" ] || [ $FLUTTER_CHANGED_GLOBAL -gt 0 ]; then echo "Running for all packages" - pub global run flutter_plugin_tools "$@" + pub global run flutter_plugin_tools "$@" $PLUGIN_SHARDING else echo "Running only for $FLUTTER_CHANGED_PACKAGES" pub global run flutter_plugin_tools "$@" --plugins=$FLUTTER_CHANGED_PACKAGES diff --git a/script/plugin_tools.sh b/script/plugin_tools.sh deleted file mode 100755 index 3edbb89d2f85..000000000000 --- a/script/plugin_tools.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -ev - -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - echo "Running for all packages ($PLUGIN_SHARDING)" - pub global run flutter_plugin_tools "$@" $PLUGIN_SHARDING -else - FLUTTER_CHANGED_GLOBAL=`git diff --name-only $TRAVIS_COMMIT_RANGE | grep -v packages | wc -l` - FLUTTER_CHANGED_PACKAGES=`git diff --name-only $TRAVIS_COMMIT_RANGE | grep -o "packages/[^/]*" | sed -e "s/packages\///g" | sort | uniq | paste -s -d, -` - if [ "${FLUTTER_CHANGED_PACKAGES}" = "" ] || [ $FLUTTER_CHANGED_GLOBAL -gt 0 ]; then - echo "Running for all packages ($PLUGIN_SHARDING)" - pub global run flutter_plugin_tools "$@" $PLUGIN_SHARDING - else - echo "Running only for $FLUTTER_CHANGED_PACKAGES" - pub global run flutter_plugin_tools "$@" --plugins=$FLUTTER_CHANGED_PACKAGES - fi -fi