From 942ccc5cb09ddd243db556ac41b94f468f0bf2d7 Mon Sep 17 00:00:00 2001 From: Ian Hickson Date: Wed, 18 May 2016 11:38:45 -0700 Subject: [PATCH] Try to simplify our bot setup. (#3986) This moves all the bot-related files to `dev/bots`, hiding it from our home page in github. Also, simplifies the travis setup, though that doesn't do any difference to the performance sadly. --- .travis.yml | 13 +++++-------- {infra => dev/bots}/.gitignore | 0 {infra => dev/bots}/README.md | 17 +++++++++++------ {infra => dev/bots}/VERSION_LINUX_NDK | 0 {infra => dev/bots}/VERSION_LINUX_SDK | 0 {infra => dev/bots}/VERSION_MACOSX_NDK | 0 {infra => dev/bots}/VERSION_MACOSX_SDK | 0 {infra => dev/bots}/docs.sh | 0 {infra => dev/bots}/download_android_tools.py | 0 {infra => dev/bots}/find_depot_tools.py | 0 {travis => dev/bots}/setup.sh | 0 {travis => dev/bots}/test.sh | 0 12 files changed, 16 insertions(+), 14 deletions(-) rename {infra => dev/bots}/.gitignore (100%) rename {infra => dev/bots}/README.md (86%) rename {infra => dev/bots}/VERSION_LINUX_NDK (100%) rename {infra => dev/bots}/VERSION_LINUX_SDK (100%) rename {infra => dev/bots}/VERSION_MACOSX_NDK (100%) rename {infra => dev/bots}/VERSION_MACOSX_SDK (100%) rename {infra => dev/bots}/docs.sh (100%) rename {infra => dev/bots}/download_android_tools.py (100%) rename {infra => dev/bots}/find_depot_tools.py (100%) rename {travis => dev/bots}/setup.sh (100%) rename {travis => dev/bots}/test.sh (100%) diff --git a/.travis.yml b/.travis.yml index c0f6c3b0f5..0169279ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,15 @@ -language: dart sudo: false -dart: - - stable addons: apt: + # sky_shell binary depends on /usr/lib/x86_64-linux-gnu/libstdc++.so.6 version GLIBCXX_3.4.18 sources: - - ubuntu-toolchain-r-test + - ubuntu-toolchain-r-test # if we don't specify this, the libstdc++6 we get is the wrong version packages: - - gcc-4.8 - - g++-4.8 + - libstdc++6 before_script: - - ./travis/setup.sh + - ./dev/bots/setup.sh script: - - ./travis/test.sh + - ./dev/bots/test.sh cache: directories: - $HOME/.pub-cache diff --git a/infra/.gitignore b/dev/bots/.gitignore similarity index 100% rename from infra/.gitignore rename to dev/bots/.gitignore diff --git a/infra/README.md b/dev/bots/README.md similarity index 86% rename from infra/README.md rename to dev/bots/README.md index eb14b88e97..374edb18a8 100644 --- a/infra/README.md +++ b/dev/bots/README.md @@ -2,14 +2,19 @@ This directory exists to support building Flutter on our build infrastructure. -The results of such builds are viewable at -https://build.chromium.org/p/client.flutter/waterfall +The results of such builds are viewable at: +* https://build.chromium.org/p/client.flutter/waterfall +* https://travis-ci.org/flutter/flutter/builds (limited checking used just for PRs on github) -The external master pages do not allow forcing new builds. Contact -@eseidelGoogle or another member of Google's Flutter team if you need to do -that. +The external master pages for the chromium infra bots do not allow +forcing new builds. Contact @eseidelGoogle or another member of +Google's Flutter team if you need to do that. -Our infrastructure is broken into two parts. A buildbot master specified by our +The Travis-based bots are trivial, and just run a couple of shell +scripts. The rest of this document discusses only the chromium infra +bots. + +This infrastructure is broken into two parts. A buildbot master specified by our [builders.pyl](https://chromium.googlesource.com/chromium/tools/build.git/+/master/masters/master.client.flutter/builders.pyl) file, and a [set of recipes](https://chromium.googlesource.com/chromium/tools/build.git/+/master/scripts/slave/recipes/flutter) diff --git a/infra/VERSION_LINUX_NDK b/dev/bots/VERSION_LINUX_NDK similarity index 100% rename from infra/VERSION_LINUX_NDK rename to dev/bots/VERSION_LINUX_NDK diff --git a/infra/VERSION_LINUX_SDK b/dev/bots/VERSION_LINUX_SDK similarity index 100% rename from infra/VERSION_LINUX_SDK rename to dev/bots/VERSION_LINUX_SDK diff --git a/infra/VERSION_MACOSX_NDK b/dev/bots/VERSION_MACOSX_NDK similarity index 100% rename from infra/VERSION_MACOSX_NDK rename to dev/bots/VERSION_MACOSX_NDK diff --git a/infra/VERSION_MACOSX_SDK b/dev/bots/VERSION_MACOSX_SDK similarity index 100% rename from infra/VERSION_MACOSX_SDK rename to dev/bots/VERSION_MACOSX_SDK diff --git a/infra/docs.sh b/dev/bots/docs.sh similarity index 100% rename from infra/docs.sh rename to dev/bots/docs.sh diff --git a/infra/download_android_tools.py b/dev/bots/download_android_tools.py similarity index 100% rename from infra/download_android_tools.py rename to dev/bots/download_android_tools.py diff --git a/infra/find_depot_tools.py b/dev/bots/find_depot_tools.py similarity index 100% rename from infra/find_depot_tools.py rename to dev/bots/find_depot_tools.py diff --git a/travis/setup.sh b/dev/bots/setup.sh similarity index 100% rename from travis/setup.sh rename to dev/bots/setup.sh diff --git a/travis/test.sh b/dev/bots/test.sh similarity index 100% rename from travis/test.sh rename to dev/bots/test.sh