From 88f24d6af20bf47b33bddc5d2a9bdec366c8dead Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Wed, 5 Aug 2020 09:43:53 -0700 Subject: [PATCH] Switched the linter to use the dart that comes with the engine. (flutter/engine#20247) --- engine/src/flutter/ci/lint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/src/flutter/ci/lint.sh b/engine/src/flutter/ci/lint.sh index c926c5998e1..d6da6805506 100755 --- a/engine/src/flutter/ci/lint.sh +++ b/engine/src/flutter/ci/lint.sh @@ -1,6 +1,9 @@ #!/bin/bash set -e +SCRIPT_DIR=`realpath $(dirname "${BASH_SOURCE[0]}")` +DART="${SCRIPT_DIR}/../../third_party/dart/tools/sdks/dart-sdk/bin/dart" +PUB="${SCRIPT_DIR}/../../third_party/dart/tools/sdks/dart-sdk/bin/pub" # Needed because if it is set, cd may print the path it changed to. unset CDPATH @@ -41,7 +44,7 @@ if [ ! -f "$COMPILE_COMMANDS" ]; then fi cd "$CI_DIR" -pub get && dart \ +$PUB get && $DART \ --disable-dart-dev \ bin/lint.dart \ --compile-commands="$COMPILE_COMMANDS" \