From 9903d86d50effca733deb4cf9df91050daab9bea Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Mon, 26 Nov 2018 18:42:39 +0000 Subject: [PATCH] [infra] Apply flutter patches in flutter-analyze builds as well Change-Id: Ibc4b4f1267ee533040cf81d940395af1985a3b76 Reviewed-on: https://dart-review.googlesource.com/c/85386 Reviewed-by: Paul Berry --- tools/bots/flutter/analyze_flutter.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/bots/flutter/analyze_flutter.sh b/tools/bots/flutter/analyze_flutter.sh index c54f4614b3a..0685c0ecd7c 100755 --- a/tools/bots/flutter/analyze_flutter.sh +++ b/tools/bots/flutter/analyze_flutter.sh @@ -6,8 +6,9 @@ # Runs flutter's analyzer related tests with a locally built SDK. set -e -dart=$(pwd)/tools/sdks/dart-sdk/bin/dart -sdk=$(pwd)/out/ReleaseX64/dart-sdk +checkout=$(pwd) +dart=$checkout/tools/sdks/dart-sdk/bin/dart +sdk=$checkout/out/ReleaseX64/dart-sdk tmpdir=$(mktemp -d) cleanup() { rm -rf "$tmpdir" @@ -20,6 +21,13 @@ git clone -vv https://chromium.googlesource.com/external/github.com/flutter/flut cd flutter bin/flutter config --no-analytics + +pinned_dart_sdk=$(cat bin/cache/dart-sdk/revision) +patch=$checkout/tools/patches/flutter-engine/${pinned_dart_sdk}.flutter.patch +if [ -e "$patch" ]; then + git apply $patch +fi + bin/flutter update-packages $dart dev/bots/analyze.dart --dart-sdk $sdk