diff --git a/ci/analyze.sh b/ci/analyze.sh index 6eb2a529c949a..fd8d213fd71c2 100755 --- a/ci/analyze.sh +++ b/ci/analyze.sh @@ -92,3 +92,7 @@ analyze \ --packages="$FLUTTER_DIR/testing/scenario_app/.dart_tool/package_config.json" \ --options "$FLUTTER_DIR/analysis_options.yaml" \ "$FLUTTER_DIR/testing/scenario_app" + +# Check that dart libraries conform. +(cd "$FLUTTER_DIR/web_sdk"; pub get) +(cd "$FLUTTER_DIR"; dart "web_sdk/test/api_conform_test.dart") diff --git a/ci/build.sh b/ci/build.sh deleted file mode 100755 index 5555fc4efd5e3..0000000000000 --- a/ci/build.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -set -e - -# Needed because if it is set, cd may print the path it changed to. -unset CDPATH - -# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one -# link at a time, and then cds into the link destination and find out where it -# ends up. -# -# The function is enclosed in a subshell to avoid changing the working directory -# of the caller. -function follow_links() ( - cd -P "$(dirname -- "$1")" - file="$PWD/$(basename -- "$1")" - while [[ -h "$file" ]]; do - cd -P "$(dirname -- "$file")" - file="$(readlink -- "$file")" - cd -P "$(dirname -- "$file")" - file="$PWD/$(basename -- "$file")" - done - echo "$file" -) - -SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")") -SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)" -FLUTTER_DIR="$SRC_DIR/flutter" - -set -x - -PATH="$SRC_DIR/third_party/dart/tools/sdks/dart-sdk/bin:$HOME/depot_tools:$PATH" - -cd "$SRC_DIR" - -# Build the dart UI files -"$FLUTTER_DIR/tools/gn" --unoptimized -ninja -C "$SRC_DIR/out/host_debug_unopt" generate_dart_ui - -# Analyze the dart UI -"$FLUTTER_DIR/ci/analyze.sh" -"$FLUTTER_DIR/ci/licenses.sh" - -# Check that dart libraries conform -(cd "$FLUTTER_DIR/web_sdk"; pub get) -(cd "$FLUTTER_DIR"; dart "web_sdk/test/api_conform_test.dart") \ No newline at end of file