Skip to content

do not test on half-installed Flutter #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yjbanov merged 2 commits into from
Mar 29, 2017
Merged

do not test on half-installed Flutter #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28631f2
do not test on half-installed Flutter
yjbanov Mar 29, 2017
ace4f58
path & generics clean-up
yjbanov Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 37 additions & 10 deletions agent/lib/src/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,17 @@ void rrm(FileSystemEntity entity) {

List<FileSystemEntity> ls(Directory directory) => directory.listSync();

Directory dir(String path) => new Directory(path);
/// Creates a directory from the given path, or multiple path parts by joining
/// them using OS-specific file path separator.
Directory dir(String thePath, [String part2, String part3, String part4, String part5, String part6, String part7, String part8]) {
return new Directory(path.join(thePath, part2, part3, part4, part5, part6, part7, part8));
}

File file(String path) => new File(path);
/// Creates a file from the given path, or multiple path parts by joining
/// them using OS-specific file path separator.
File file(String thePath, [String part2, String part3, String part4, String part5, String part6, String part7, String part8]) {
return new File(path.join(thePath, part2, part3, part4, part5, part6, part7, part8));
}

void copy(File sourceFile, Directory targetDirectory, { String name }) {
File target = file(path.join(targetDirectory.path, name ?? path.basename(sourceFile.path)));
Expand Down Expand Up @@ -140,7 +148,7 @@ Future<String> getDartVersion() async {
}

Future<String> getCurrentFlutterRepoCommit() {
if (!dir('${config.flutterDirectory.path}/.git').existsSync()) {
if (!dir(config.flutterDirectory.path, '.git').existsSync()) {
return null;
}

Expand All @@ -158,8 +166,23 @@ Future<DateTime> getFlutterRepoCommitTimestamp(String commit) {
});
}

/// When exists, this file indicates an installation is in progress or failed
/// to complete.
File get _installationLock => file(config.flutterDirectory.path, '.installation-lock');

/// Flutter repository revision that's currently installed.
///
/// Returns `null` if nothing is installed or installation failed to complete.
Future<String> _getCurrentInstallationRevision() async {
if (exists(_installationLock)) {
return null;
}

return getCurrentFlutterRepoCommit();
}

Future<Null> getFlutterAt(String revision) async {
String currentRevision = await getCurrentFlutterRepoCommit();
String currentRevision = await _getCurrentInstallationRevision();

// This agent will likely run multiple tasks in the same checklist and
// therefore the same revision. It would be too costly to have to reinstall
Expand Down Expand Up @@ -248,7 +271,7 @@ Future<int> flutter(String command, {List<String> options: const<String>[], bool
return exec(path.join(config.flutterDirectory.path, 'bin', 'flutter'), args, canFail: canFail);
}

String get dartBin => path.join(config.flutterDirectory.path, 'bin/cache/dart-sdk/bin/dart');
String get dartBin => path.join(config.flutterDirectory.path, 'bin', 'cache', 'dart-sdk', 'bin', 'dart');

Future<int> dart(List<String> args) => exec(dartBin, args);

Expand Down Expand Up @@ -297,14 +320,14 @@ class Config {

Map<String, dynamic> agentConfig = loadYaml(agentConfigFile.readAsStringSync());
String baseCocoonUrl = agentConfig['base_cocoon_url'] ?? 'https://flutter-dashboard.appspot.com';
String agentId = requireConfigProperty(agentConfig, 'agent_id');
String firebaseFlutterDashboardToken = requireConfigProperty(agentConfig, 'firebase_flutter_dashboard_token');
String authToken = requireConfigProperty(agentConfig, 'auth_token');
String agentId = requireConfigProperty<String>(agentConfig, 'agent_id');
String firebaseFlutterDashboardToken = requireConfigProperty<String>(agentConfig, 'firebase_flutter_dashboard_token');
String authToken = requireConfigProperty<String>(agentConfig, 'auth_token');
String home = Platform.environment['HOME'] ?? Platform.environment['USERPROFILE'];
if (home == null)
throw "Unable to find \$HOME or \$USERPROFILE.";

Directory flutterDirectory = dir('$home/.cocoon/flutter');
Directory flutterDirectory = dir(home, '.cocoon', 'flutter');
mkdirs(flutterDirectory);

DeviceOperatingSystem deviceOperatingSystem;
Expand Down Expand Up @@ -371,7 +394,7 @@ String requireEnvVar(String name) {
return value;
}

dynamic/*=T*/ requireConfigProperty/*<T>*/(Map<String, dynamic/*<T>*/> map, String propertyName) {
T requireConfigProperty<T>(Map<String, T> map, String propertyName) {
if (!map.containsKey(propertyName))
fail('Configuration property not found: $propertyName');

Expand All @@ -385,6 +408,8 @@ String jsonEncode(dynamic data) {
Future<Null> getFlutter(String revision) async {
section('Get Flutter!');

await _installationLock.writeAsString('installation in progress');

if (exists(config.flutterDirectory)) {
rrm(config.flutterDirectory);
}
Expand All @@ -404,6 +429,8 @@ Future<Null> getFlutter(String revision) async {

section('flutter update-packages');
await flutter('update-packages');

rm(_installationLock);
}

void checkNotNull(Object o1, [Object o2 = 1, Object o3 = 1, Object o4 = 1,
Expand Down