Skip to content

Commit

Permalink
Setup flutter (beta) as submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
chalin committed Sep 10, 2018
1 parent 1c19603 commit 9ad6467
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 58 deletions.
6 changes: 5 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:

before_install:
- source ./tool/env-set.sh
- ./tool/before_install.sh
- ./tool/before-install.sh

install:
- ./tool/install.sh
Expand Down
1 change: 1 addition & 0 deletions flutter
Submodule flutter added at 3b309b
24 changes: 19 additions & 5 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion site-shared
1 change: 0 additions & 1 deletion tool/before-install.sh

This file was deleted.

22 changes: 22 additions & 0 deletions tool/before-install.sh
Original file line number Diff line number Diff line change
@@ -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
49 changes: 0 additions & 49 deletions tool/before_install.sh

This file was deleted.

0 comments on commit 9ad6467

Please sign in to comment.