From 213b629eb3fc07290e84504c3a58617c601f7ec5 Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Mon, 2 Dec 2019 15:38:51 -0800 Subject: [PATCH 01/14] Add macos tastk --- .cirrus.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index af37fc630c2f..3164fd64d19f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -124,3 +124,45 @@ task: - flutter channel $CHANNEL - ./script/incremental_build.sh build-examples --ipa - ./script/incremental_build.sh drive-examples +task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' + osx_instance: + image: mojave-xcode-11.2.1-flutter + setup_script: + - flutter config --enable-macos-desktop + - pod repo update + upgrade_script: + - flutter channel stable + - flutter upgrade + - flutter channel master + - flutter upgrade + - git fetch origin master + activate_script: pub global activate flutter_plugin_tools + matrix: + - name: build_all_plugins_ipa + script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/build_all_plugins_app.sh macos --no-codesign + - name: lint_darwin_plugins + script: ./script/lint_darwin_plugins.sh + - name: build-apps+drive-examples + env: + PATH: $PATH:/usr/local/bin + matrix: + PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" + matrix: + CHANNEL: "master" + SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] + build_script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/incremental_build.sh drive-examples + From a5bf337eae674ff4eb38258a02ffc174a52790cc Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Mon, 2 Dec 2019 16:21:30 -0800 Subject: [PATCH 02/14] Remove stable --- .cirrus.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3164fd64d19f..5d6225d92678 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -132,18 +132,16 @@ task: - flutter config --enable-macos-desktop - pod repo update upgrade_script: - - flutter channel stable - - flutter upgrade - flutter channel master - flutter upgrade - git fetch origin master activate_script: pub global activate flutter_plugin_tools matrix: - name: build_all_plugins_ipa + env: + matrix: + CHANNEL: "master" script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh macos --no-codesign - name: lint_darwin_plugins @@ -160,9 +158,6 @@ task: CHANNEL: "master" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh drive-examples From d522a818a5766a9d423d83e164d6d05f20441d4c Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Mon, 2 Dec 2019 16:33:21 -0800 Subject: [PATCH 03/14] Again --- .cirrus.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5d6225d92678..1b97ee951e79 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -138,11 +138,8 @@ task: activate_script: pub global activate flutter_plugin_tools matrix: - name: build_all_plugins_ipa - env: - matrix: - CHANNEL: "master" script: - - flutter channel $CHANNEL + - flutter channel master - ./script/build_all_plugins_app.sh macos --no-codesign - name: lint_darwin_plugins script: ./script/lint_darwin_plugins.sh @@ -154,10 +151,8 @@ task: PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" - matrix: - CHANNEL: "master" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - - flutter channel $CHANNEL + - flutter channel master - ./script/incremental_build.sh drive-examples From 1a70bc491a87574d85d501c42e991d5da4e7b4d0 Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Mon, 2 Dec 2019 16:56:30 -0800 Subject: [PATCH 04/14] Remove flag --- .cirrus.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1b97ee951e79..ff096609851d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -129,7 +129,6 @@ task: osx_instance: image: mojave-xcode-11.2.1-flutter setup_script: - - flutter config --enable-macos-desktop - pod repo update upgrade_script: - flutter channel master @@ -140,7 +139,8 @@ task: - name: build_all_plugins_ipa script: - flutter channel master - - ./script/build_all_plugins_app.sh macos --no-codesign + - flutter config --enable-macos-desktop + - ./script/build_all_plugins_app.sh macos - name: lint_darwin_plugins script: ./script/lint_darwin_plugins.sh - name: build-apps+drive-examples @@ -154,5 +154,6 @@ task: SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - flutter channel master + - flutter config --enable-macos-desktop - ./script/incremental_build.sh drive-examples From 06f74f09f356d71f98ecada8cf189df534fc5bee Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Tue, 3 Dec 2019 10:35:00 -0800 Subject: [PATCH 05/14] Remove other tasks for test --- .cirrus.yml | 126 ---------------------------------------------------- 1 file changed, 126 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ff096609851d..0840deb58fb0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,129 +1,3 @@ -task: - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - container: - dockerfile: .ci/Dockerfile - cpu: 8 - memory: 16G - upgrade_script: - - flutter channel stable - - flutter upgrade - - flutter channel master - - flutter upgrade - - git fetch origin master - activate_script: pub global activate flutter_plugin_tools - matrix: - - name: publishable - script: - - flutter channel stable - - ./script/check_publish.sh - - name: format - install_script: - - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" - - sudo apt-get update - - sudo apt-get install -y --allow-unauthenticated clang-format-7 - format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7 - - name: test - env: - matrix: - CHANNEL: "master" - CHANNEL: "stable" - test_script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/incremental_build.sh test - - name: analyze - script: ./script/incremental_build.sh analyze - - name: build_all_plugins_apk - script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/build_all_plugins_app.sh apk - - name: build-apks+java-test+firebase-test-lab - env: - matrix: - PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" - PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2" - matrix: - CHANNEL: "master" - CHANNEL: "stable" - MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] - GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4] - script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they - # might include non-ASCII characters which makes Gradle crash. - # See: https://github.com/flutter/flutter/issues/24935 - # This is a temporary workaround until we figure how to properly configure - # a UTF8 locale on Cirrus (or until the Gradle bug is fixed). - # TODO(amirh): Set the locale to UTF8. - - echo "$CIRRUS_CHANGE_MESSAGE" > /tmp/cirrus_change_message.txt - - echo "$CIRRUS_COMMIT_MESSAGE" > /tmp/cirrus_commit_message.txt - - export CIRRUS_CHANGE_MESSAGE="" - - export CIRRUS_COMMIT_MESSAGE="" - - ./script/incremental_build.sh build-examples --apk - - ./script/incremental_build.sh java-test # must come after apk build - - if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then - - echo "This user does not have permission to run Firebase Test Lab tests." - - else - - echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json - - ./script/incremental_build.sh firebase-test-lab - - fi - - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt` - - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt` - -task: - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' - osx_instance: - image: mojave-xcode-11.2.1-flutter - setup_script: - - pod repo update - upgrade_script: - - flutter channel stable - - flutter upgrade - - flutter channel master - - flutter upgrade - - git fetch origin master - activate_script: pub global activate flutter_plugin_tools - create_simulator_script: - - xcrun simctl list - - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot - matrix: - - name: build_all_plugins_ipa - script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/build_all_plugins_app.sh ios --no-codesign - - name: lint_darwin_plugins - script: ./script/lint_darwin_plugins.sh - - name: build-ipas+drive-examples - env: - PATH: $PATH:/usr/local/bin - matrix: - PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" - matrix: - CHANNEL: "master" - CHANNEL: "stable" - SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] - build_script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/incremental_build.sh build-examples --ipa - - ./script/incremental_build.sh drive-examples task: use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' osx_instance: From b0b52f54becd125a29a76101d2b66013cf17f31d Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Tue, 3 Dec 2019 18:05:07 -0800 Subject: [PATCH 06/14] Added back old --- .cirrus.yml | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0840deb58fb0..5d6225d92678 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,8 +1,135 @@ +task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' + container: + dockerfile: .ci/Dockerfile + cpu: 8 + memory: 16G + upgrade_script: + - flutter channel stable + - flutter upgrade + - flutter channel master + - flutter upgrade + - git fetch origin master + activate_script: pub global activate flutter_plugin_tools + matrix: + - name: publishable + script: + - flutter channel stable + - ./script/check_publish.sh + - name: format + install_script: + - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" + - sudo apt-get update + - sudo apt-get install -y --allow-unauthenticated clang-format-7 + format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7 + - name: test + env: + matrix: + CHANNEL: "master" + CHANNEL: "stable" + test_script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/incremental_build.sh test + - name: analyze + script: ./script/incremental_build.sh analyze + - name: build_all_plugins_apk + script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/build_all_plugins_app.sh apk + - name: build-apks+java-test+firebase-test-lab + env: + matrix: + PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" + PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2" + matrix: + CHANNEL: "master" + CHANNEL: "stable" + MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] + GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4] + script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they + # might include non-ASCII characters which makes Gradle crash. + # See: https://github.com/flutter/flutter/issues/24935 + # This is a temporary workaround until we figure how to properly configure + # a UTF8 locale on Cirrus (or until the Gradle bug is fixed). + # TODO(amirh): Set the locale to UTF8. + - echo "$CIRRUS_CHANGE_MESSAGE" > /tmp/cirrus_change_message.txt + - echo "$CIRRUS_COMMIT_MESSAGE" > /tmp/cirrus_commit_message.txt + - export CIRRUS_CHANGE_MESSAGE="" + - export CIRRUS_COMMIT_MESSAGE="" + - ./script/incremental_build.sh build-examples --apk + - ./script/incremental_build.sh java-test # must come after apk build + - if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then + - echo "This user does not have permission to run Firebase Test Lab tests." + - else + - echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json + - ./script/incremental_build.sh firebase-test-lab + - fi + - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt` + - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt` + +task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' + osx_instance: + image: mojave-xcode-11.2.1-flutter + setup_script: + - pod repo update + upgrade_script: + - flutter channel stable + - flutter upgrade + - flutter channel master + - flutter upgrade + - git fetch origin master + activate_script: pub global activate flutter_plugin_tools + create_simulator_script: + - xcrun simctl list + - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot + matrix: + - name: build_all_plugins_ipa + script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/build_all_plugins_app.sh ios --no-codesign + - name: lint_darwin_plugins + script: ./script/lint_darwin_plugins.sh + - name: build-ipas+drive-examples + env: + PATH: $PATH:/usr/local/bin + matrix: + PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" + matrix: + CHANNEL: "master" + CHANNEL: "stable" + SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] + build_script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/incremental_build.sh build-examples --ipa + - ./script/incremental_build.sh drive-examples task: use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' osx_instance: image: mojave-xcode-11.2.1-flutter setup_script: + - flutter config --enable-macos-desktop - pod repo update upgrade_script: - flutter channel master @@ -11,10 +138,12 @@ task: activate_script: pub global activate flutter_plugin_tools matrix: - name: build_all_plugins_ipa + env: + matrix: + CHANNEL: "master" script: - - flutter channel master - - flutter config --enable-macos-desktop - - ./script/build_all_plugins_app.sh macos + - flutter channel $CHANNEL + - ./script/build_all_plugins_app.sh macos --no-codesign - name: lint_darwin_plugins script: ./script/lint_darwin_plugins.sh - name: build-apps+drive-examples @@ -25,9 +154,10 @@ task: PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" + matrix: + CHANNEL: "master" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - - flutter channel master - - flutter config --enable-macos-desktop + - flutter channel $CHANNEL - ./script/incremental_build.sh drive-examples From 642068b70a5f749036ca81b1a29e7825786589d4 Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Wed, 4 Dec 2019 17:04:00 -0800 Subject: [PATCH 07/14] Filter out stable --- .cirrus.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5d6225d92678..2b3a4e23bee0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -129,21 +129,22 @@ task: osx_instance: image: mojave-xcode-11.2.1-flutter setup_script: - - flutter config --enable-macos-desktop - pod repo update + - flutter config --enable-macos-desktop upgrade_script: - flutter channel master - flutter upgrade - git fetch origin master activate_script: pub global activate flutter_plugin_tools matrix: - - name: build_all_plugins_ipa - env: - matrix: - CHANNEL: "master" + - name: build_all_plugins_app script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - - ./script/build_all_plugins_app.sh macos --no-codesign + - ./script/build_all_plugins_app.sh macos - name: lint_darwin_plugins script: ./script/lint_darwin_plugins.sh - name: build-apps+drive-examples @@ -158,6 +159,10 @@ task: CHANNEL: "master" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - - ./script/incremental_build.sh drive-examples - + - ./script/incremental_build.sh build-examples --macos --no-ipa + - ./script/incremental_build.sh drive-examples --macos From c6c6d7929987582e6601c546c688d3886dc52aa8 Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Wed, 4 Dec 2019 17:20:38 -0800 Subject: [PATCH 08/14] Clean --- .cirrus.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2b3a4e23bee0..5c500b3d05fb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -31,7 +31,7 @@ task: test_script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh test - name: analyze @@ -40,7 +40,7 @@ task: script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh apk - name: build-apks+java-test+firebase-test-lab @@ -56,7 +56,7 @@ task: script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they # might include non-ASCII characters which makes Gradle crash. @@ -100,7 +100,7 @@ task: script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh ios --no-codesign - name: lint_darwin_plugins @@ -120,7 +120,7 @@ task: build_script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh build-examples --ipa - ./script/incremental_build.sh drive-examples @@ -141,8 +141,7 @@ task: script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _macos$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh macos - name: lint_darwin_plugins @@ -161,8 +160,7 @@ task: build_script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _macos$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh build-examples --macos --no-ipa - ./script/incremental_build.sh drive-examples --macos From 9c66f9c94f8ac66653046dcf07821b77d4932950 Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Wed, 4 Dec 2019 17:22:10 -0800 Subject: [PATCH 09/14] Fix comments --- .cirrus.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5c500b3d05fb..a3ed95e8ffee 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,7 +29,7 @@ task: CHANNEL: "master" CHANNEL: "stable" test_script: - # TODO(jackson): Allow web plugins once supported on stable + # TODO(jackson): Allow web and macos plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL @@ -38,7 +38,7 @@ task: script: ./script/incremental_build.sh analyze - name: build_all_plugins_apk script: - # TODO(jackson): Allow web plugins once supported on stable + # TODO(jackson): Allow web and macos plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL @@ -54,7 +54,7 @@ task: MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4] script: - # TODO(jackson): Allow web plugins once supported on stable + # TODO(jackson): Allow web and macos plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL @@ -98,7 +98,7 @@ task: matrix: - name: build_all_plugins_ipa script: - # TODO(jackson): Allow web plugins once supported on stable + # TODO(jackson): Allow web and macos plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL @@ -118,7 +118,7 @@ task: CHANNEL: "stable" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - # TODO(jackson): Allow web plugins once supported on stable + # TODO(jackson): Allow web and macos plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL @@ -139,7 +139,7 @@ task: matrix: - name: build_all_plugins_app script: - # TODO(jackson): Allow web plugins once supported on stable + # TODO(jackson): Allow web and macos plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL @@ -158,7 +158,7 @@ task: CHANNEL: "master" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - # TODO(jackson): Allow web plugins once supported on stable + # TODO(jackson): Allow web and macos plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - flutter channel $CHANNEL From 5fac71cffdeef6ed0e8949bb02dcee0f74b1ea2e Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Thu, 5 Dec 2019 14:51:55 -0800 Subject: [PATCH 10/14] Remove filter --- .cirrus.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index a3ed95e8ffee..380aa3aee257 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,18 +29,18 @@ task: CHANNEL: "master" CHANNEL: "stable" test_script: - # TODO(jackson): Allow web and macos plugins once supported on stable + # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh test - name: analyze script: ./script/incremental_build.sh analyze - name: build_all_plugins_apk script: - # TODO(jackson): Allow web and macos plugins once supported on stable + # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh apk - name: build-apks+java-test+firebase-test-lab @@ -54,9 +54,9 @@ task: MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4] script: - # TODO(jackson): Allow web and macos plugins once supported on stable + # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they # might include non-ASCII characters which makes Gradle crash. @@ -98,9 +98,9 @@ task: matrix: - name: build_all_plugins_ipa script: - # TODO(jackson): Allow web and macos plugins once supported on stable + # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh ios --no-codesign - name: lint_darwin_plugins @@ -118,9 +118,9 @@ task: CHANNEL: "stable" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - # TODO(jackson): Allow web and macos plugins once supported on stable + # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh build-examples --ipa - ./script/incremental_build.sh drive-examples @@ -139,10 +139,7 @@ task: matrix: - name: build_all_plugins_app script: - # TODO(jackson): Allow web and macos plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - - flutter channel $CHANNEL + - flutter channel master - ./script/build_all_plugins_app.sh macos - name: lint_darwin_plugins script: ./script/lint_darwin_plugins.sh @@ -154,13 +151,8 @@ task: PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" - matrix: - CHANNEL: "master" SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - # TODO(jackson): Allow web and macos plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep -E _web$\|_macos$ | xargs rm -rf; fi - - flutter channel $CHANNEL + - flutter channel master - ./script/incremental_build.sh build-examples --macos --no-ipa - ./script/incremental_build.sh drive-examples --macos From a74fea0f740f044d39743cb9895a3364a1ae1747 Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Thu, 5 Dec 2019 14:53:44 -0800 Subject: [PATCH 11/14] Spaces --- .cirrus.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 380aa3aee257..62b41cee1aa7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -31,7 +31,7 @@ task: test_script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh test - name: analyze @@ -40,7 +40,7 @@ task: script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh apk - name: build-apks+java-test+firebase-test-lab @@ -56,7 +56,7 @@ task: script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they # might include non-ASCII characters which makes Gradle crash. @@ -100,7 +100,7 @@ task: script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/build_all_plugins_app.sh ios --no-codesign - name: lint_darwin_plugins @@ -120,7 +120,7 @@ task: build_script: # TODO(jackson): Allow web plugins once supported on stable # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - flutter channel $CHANNEL - ./script/incremental_build.sh build-examples --ipa - ./script/incremental_build.sh drive-examples From eca92a8fbe53a1233e5413e34242cc0e8c067afa Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Fri, 6 Dec 2019 09:45:49 -0800 Subject: [PATCH 12/14] Remove other tests for rapid testing, will bring back --- .cirrus.yml | 126 ---------------------------------------------------- 1 file changed, 126 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 62b41cee1aa7..0530d0ef2411 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,129 +1,3 @@ -task: - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - container: - dockerfile: .ci/Dockerfile - cpu: 8 - memory: 16G - upgrade_script: - - flutter channel stable - - flutter upgrade - - flutter channel master - - flutter upgrade - - git fetch origin master - activate_script: pub global activate flutter_plugin_tools - matrix: - - name: publishable - script: - - flutter channel stable - - ./script/check_publish.sh - - name: format - install_script: - - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" - - sudo apt-get update - - sudo apt-get install -y --allow-unauthenticated clang-format-7 - format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7 - - name: test - env: - matrix: - CHANNEL: "master" - CHANNEL: "stable" - test_script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/incremental_build.sh test - - name: analyze - script: ./script/incremental_build.sh analyze - - name: build_all_plugins_apk - script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/build_all_plugins_app.sh apk - - name: build-apks+java-test+firebase-test-lab - env: - matrix: - PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" - PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2" - matrix: - CHANNEL: "master" - CHANNEL: "stable" - MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] - GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4] - script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they - # might include non-ASCII characters which makes Gradle crash. - # See: https://github.com/flutter/flutter/issues/24935 - # This is a temporary workaround until we figure how to properly configure - # a UTF8 locale on Cirrus (or until the Gradle bug is fixed). - # TODO(amirh): Set the locale to UTF8. - - echo "$CIRRUS_CHANGE_MESSAGE" > /tmp/cirrus_change_message.txt - - echo "$CIRRUS_COMMIT_MESSAGE" > /tmp/cirrus_commit_message.txt - - export CIRRUS_CHANGE_MESSAGE="" - - export CIRRUS_COMMIT_MESSAGE="" - - ./script/incremental_build.sh build-examples --apk - - ./script/incremental_build.sh java-test # must come after apk build - - if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then - - echo "This user does not have permission to run Firebase Test Lab tests." - - else - - echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json - - ./script/incremental_build.sh firebase-test-lab - - fi - - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt` - - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt` - -task: - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' - osx_instance: - image: mojave-xcode-11.2.1-flutter - setup_script: - - pod repo update - upgrade_script: - - flutter channel stable - - flutter upgrade - - flutter channel master - - flutter upgrade - - git fetch origin master - activate_script: pub global activate flutter_plugin_tools - create_simulator_script: - - xcrun simctl list - - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot - matrix: - - name: build_all_plugins_ipa - script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/build_all_plugins_app.sh ios --no-codesign - - name: lint_darwin_plugins - script: ./script/lint_darwin_plugins.sh - - name: build-ipas+drive-examples - env: - PATH: $PATH:/usr/local/bin - matrix: - PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" - matrix: - CHANNEL: "master" - CHANNEL: "stable" - SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] - build_script: - # TODO(jackson): Allow web plugins once supported on stable - # https://github.com/flutter/flutter/issues/42864 - - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi - - flutter channel $CHANNEL - - ./script/incremental_build.sh build-examples --ipa - - ./script/incremental_build.sh drive-examples task: use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' osx_instance: From 9f3286fab3266672c99352c6189fd076de97c00e Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Fri, 6 Dec 2019 10:58:53 -0800 Subject: [PATCH 13/14] Remove sharding --- .cirrus.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0530d0ef2411..3571f1a7de04 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,12 +20,6 @@ task: - name: build-apps+drive-examples env: PATH: $PATH:/usr/local/bin - matrix: - PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" - PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" - SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] build_script: - flutter channel master - ./script/incremental_build.sh build-examples --macos --no-ipa From 52242fc1fa94a44d943a383638901c48f792d7bb Mon Sep 17 00:00:00 2001 From: Francisco Magdaleno Arceo Date: Fri, 6 Dec 2019 11:32:43 -0800 Subject: [PATCH 14/14] Bring back previous tests --- .cirrus.yml | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 3571f1a7de04..bf4cb9541073 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,3 +1,129 @@ +task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' + container: + dockerfile: .ci/Dockerfile + cpu: 8 + memory: 16G + upgrade_script: + - flutter channel stable + - flutter upgrade + - flutter channel master + - flutter upgrade + - git fetch origin master + activate_script: pub global activate flutter_plugin_tools + matrix: + - name: publishable + script: + - flutter channel stable + - ./script/check_publish.sh + - name: format + install_script: + - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" + - sudo apt-get update + - sudo apt-get install -y --allow-unauthenticated clang-format-7 + format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7 + - name: test + env: + matrix: + CHANNEL: "master" + CHANNEL: "stable" + test_script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/incremental_build.sh test + - name: analyze + script: ./script/incremental_build.sh analyze + - name: build_all_plugins_apk + script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/build_all_plugins_app.sh apk + - name: build-apks+java-test+firebase-test-lab + env: + matrix: + PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" + PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2" + matrix: + CHANNEL: "master" + CHANNEL: "stable" + MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] + GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4] + script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they + # might include non-ASCII characters which makes Gradle crash. + # See: https://github.com/flutter/flutter/issues/24935 + # This is a temporary workaround until we figure how to properly configure + # a UTF8 locale on Cirrus (or until the Gradle bug is fixed). + # TODO(amirh): Set the locale to UTF8. + - echo "$CIRRUS_CHANGE_MESSAGE" > /tmp/cirrus_change_message.txt + - echo "$CIRRUS_COMMIT_MESSAGE" > /tmp/cirrus_commit_message.txt + - export CIRRUS_CHANGE_MESSAGE="" + - export CIRRUS_COMMIT_MESSAGE="" + - ./script/incremental_build.sh build-examples --apk + - ./script/incremental_build.sh java-test # must come after apk build + - if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then + - echo "This user does not have permission to run Firebase Test Lab tests." + - else + - echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json + - ./script/incremental_build.sh firebase-test-lab + - fi + - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt` + - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt` + +task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' + osx_instance: + image: mojave-xcode-11.2.1-flutter + setup_script: + - pod repo update + upgrade_script: + - flutter channel stable + - flutter upgrade + - flutter channel master + - flutter upgrade + - git fetch origin master + activate_script: pub global activate flutter_plugin_tools + create_simulator_script: + - xcrun simctl list + - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot + matrix: + - name: build_all_plugins_ipa + script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/build_all_plugins_app.sh ios --no-codesign + - name: lint_darwin_plugins + script: ./script/lint_darwin_plugins.sh + - name: build-ipas+drive-examples + env: + PATH: $PATH:/usr/local/bin + matrix: + PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4" + PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4" + matrix: + CHANNEL: "master" + CHANNEL: "stable" + SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] + build_script: + # TODO(jackson): Allow web plugins once supported on stable + # https://github.com/flutter/flutter/issues/42864 + - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi + - flutter channel $CHANNEL + - ./script/incremental_build.sh build-examples --ipa + - ./script/incremental_build.sh drive-examples task: use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' osx_instance: