From 9ad64675d1d65c23ef59cb1ae2c8f9ec073aed2f Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Mon, 10 Sep 2018 14:50:28 -0400 Subject: [PATCH] Setup flutter (beta) as submodule --- .gitmodules | 6 +++++- .travis.yml | 2 +- flutter | 1 + pubspec.lock | 24 ++++++++++++++++----- site-shared | 2 +- tool/before-install.sh | 23 +++++++++++++++++++- tool/before_install.sh | 49 ------------------------------------------ 7 files changed, 49 insertions(+), 58 deletions(-) create mode 160000 flutter mode change 120000 => 100755 tool/before-install.sh delete mode 100755 tool/before_install.sh diff --git a/.gitmodules b/.gitmodules index 7b4948bf9b..9fea7ef82d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,8 @@ [submodule "site-shared"] path = site-shared url = https://github.com/dart-lang/site-shared.git - branch = chalin-zsh-0810 + branch = master +[submodule "flutter"] + path = flutter + url = https://github.com/flutter/flutter + branch = beta diff --git a/.travis.yml b/.travis.yml index e64e651e6b..ae27c91dfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ env: before_install: - source ./tool/env-set.sh - - ./tool/before_install.sh + - ./tool/before-install.sh install: - ./tool/install.sh diff --git a/flutter b/flutter new file mode 160000 index 0000000000..3b309bda07 --- /dev/null +++ b/flutter @@ -0,0 +1 @@ +Subproject commit 3b309bda072a6b326e8aa4591a5836af600923ce diff --git a/pubspec.lock b/pubspec.lock index 7883e6e69c..34f03b0979 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.32.4" + version: "0.32.5" args: dependency: transitive description: @@ -49,7 +49,7 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "0.10.1+1" + version: "0.10.2" build_runner_core: dependency: transitive description: @@ -165,7 +165,7 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.4+1" glob: dependency: transitive description: @@ -208,6 +208,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.3" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.1+1" json_annotation: dependency: transitive description: @@ -221,7 +228,7 @@ packages: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.4" + version: "0.3.4+1" linkcheck: dependency: "direct dev" description: @@ -242,7 +249,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.3+1" + version: "0.12.4" meta: dependency: transitive description: @@ -271,6 +278,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.6.2" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" plugin: dependency: transitive description: diff --git a/site-shared b/site-shared index 95a80a71dc..6283e88d7d 160000 --- a/site-shared +++ b/site-shared @@ -1 +1 @@ -Subproject commit 95a80a71dcb6a4c75ece1a04068413f366b03e50 +Subproject commit 6283e88d7d62e4b9f2cd8398aada64e46f7db149 diff --git a/tool/before-install.sh b/tool/before-install.sh deleted file mode 120000 index 7ad90c7c9a..0000000000 --- a/tool/before-install.sh +++ /dev/null @@ -1 +0,0 @@ -shared/before-install.sh \ No newline at end of file diff --git a/tool/before-install.sh b/tool/before-install.sh new file mode 100755 index 0000000000..5af2f6eb4f --- /dev/null +++ b/tool/before-install.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +FLUTTER_ROOT=flutter +FLUTTER_BIN="$FLUTTER_ROOT/bin" + +if [[ ! -e "$FLUTTER_ROOT" ]]; then + echo "ERROR: The ~/flutter git submodule is missing. For initialization instructions, see the repo README." + exit 1; +fi + +source tool/shared/before-install.sh + +travis_fold start before_install.flutter +echo "Refreshing Flutter repo and running doctor:" +( + set -x; + cd flutter; + git checkout beta; + git pull; + bin/flutter doctor; +) +travis_fold end before_install.flutter diff --git a/tool/before_install.sh b/tool/before_install.sh deleted file mode 100755 index 9b23ed3add..0000000000 --- a/tool/before_install.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# Fast fail the script on failures. -set -e - -[[ -z "$DART_SITE_ENV_DEFS" ]] && . ./tool/env-set.sh - -if [[ "$1" == --force ]]; then FORCE=1; fi - -if ! __type_t travis_fold; then travis_fold() { true; } fi # For ZSH users - -# if [[ -n "$TRAVIS" ]]; then -# ./tool/env-info-and-check.sh -# fi - -FLUTTER_ROOT=../flutter -FLUTTER_BIN="$FLUTTER_ROOT/bin" -# Run doctor to download the Dart SDK that is vendored with Flutter -if [[ ! -e "$FLUTTER_ROOT" || -n "$FORCE" ]]; then - travis_fold start before_install.flutter - echo "Downloading Flutter" - ( - set -x; - git clone -b beta https://github.com/flutter/flutter.git "$FLUTTER_ROOT"; - "$FLUTTER_BIN/flutter" doctor - ) - travis_fold end before_install.flutter -else - echo "Flutter already installed: $FLUTTER_ROOT" -fi - -# Don't download oauth tool since we don't currently use it. -# echo "Download Google OAuth Tool" -# pip install --user google-oauth2l --upgrade - -# Jekyll needs Ruby and the Ruby bundler -travis_fold start before_install.ruby_bundler - if [[ -n "$TRAVIS" || -n "$FORCE" || -z "$(type -t bundler)" ]]; then - (set -x; gem install bundler) - else - echo "Bundler already installed. Use --force to reinstall/update." - fi -travis_fold end before_install.ruby_bundler - -# ./tool/install-dart-sdk.sh - -travis_fold start before_install.pub - pub get -travis_fold end before_install.pub