diff --git a/.cirrus.yml b/.cirrus.yml index 537286988e7e7..bb3d1e7e851e4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -43,6 +43,6 @@ format_and_dart_test_task: cp $CIRRUS_WORKING_DIR -r ./flutter gclient sync - format_script: cd $ENGINE_PATH/src/flutter && ./travis/format.sh - build_script: cd $ENGINE_PATH/src/flutter && ./travis/build.sh - test_script: cd $ENGINE_PATH/src/flutter && ./travis/test.sh + format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh + build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh + test_script: cd $ENGINE_PATH/src/flutter && ./ci/test.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cf89c87879e9b..6fe6a92aafd73 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ Contributing to the Flutter engine ================================== -[![Build Status](https://travis-ci.org/flutter/engine.svg)](https://travis-ci.org/flutter/engine) +[![Build Status](https://cirrus-ci.com/flutter/engine.svg)](https://cirrus-ci.com/flutter/engine) _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#code-of-conduct)_ diff --git a/travis/analyze.sh b/ci/analyze.sh similarity index 100% rename from travis/analyze.sh rename to ci/analyze.sh diff --git a/travis/build.sh b/ci/build.sh similarity index 72% rename from travis/build.sh rename to ci/build.sh index 73252bbb84375..bf517b64cc0fe 100755 --- a/travis/build.sh +++ b/ci/build.sh @@ -7,5 +7,5 @@ cd .. flutter/tools/gn --unoptimized ninja -C out/host_debug_unopt generate_dart_ui -flutter/travis/analyze.sh -flutter/travis/licenses.sh +flutter/ci/analyze.sh +flutter/ci/licenses.sh diff --git a/travis/check_roll.sh b/ci/check_roll.sh similarity index 100% rename from travis/check_roll.sh rename to ci/check_roll.sh diff --git a/travis/format.sh b/ci/format.sh similarity index 100% rename from travis/format.sh rename to ci/format.sh diff --git a/travis/licenses.sh b/ci/licenses.sh similarity index 83% rename from travis/licenses.sh rename to ci/licenses.sh index adc74b5c553bd..974aaab468eff 100755 --- a/travis/licenses.sh +++ b/ci/licenses.sh @@ -3,10 +3,10 @@ set -e shopt -s nullglob echo "Verifying license script is still happy..." -(cd flutter/tools/licenses; pub get; dart --checked lib/main.dart --src ../../.. --out ../../../out/license_script_output --golden ../../travis/licenses_golden) +(cd flutter/tools/licenses; pub get; dart --checked lib/main.dart --src ../../.. --out ../../../out/license_script_output --golden ../../ci/licenses_golden) for f in out/license_script_output/licenses_*; do - if ! cmp -s flutter/travis/licenses_golden/$(basename $f) $f + if ! cmp -s flutter/ci/licenses_golden/$(basename $f) $f then echo "License script got different results than expected for $f." echo "Please rerun the licenses script locally to verify that it is" @@ -16,7 +16,7 @@ for f in out/license_script_output/licenses_*; do echo "For more information, see the script in:" echo " https://github.com/flutter/engine/tree/master/tools/licenses" echo "" - diff -U 6 flutter/travis/licenses_golden/$(basename $f) $f + diff -U 6 flutter/ci/licenses_golden/$(basename $f) $f exit 1 fi done diff --git a/travis/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter similarity index 99% rename from travis/licenses_golden/licenses_flutter rename to ci/licenses_golden/licenses_flutter index 51a82ae8f40f7..dc110cc7204df 100644 --- a/travis/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -187,10 +187,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIBRARY: engine ORIGIN: ../../../LICENSE TYPE: LicenseType.bsd -FILE: ../../../flutter/.cirrus.yml FILE: ../../../flutter/DEPS -FILE: ../../../flutter/ci/docker/build/Dockerfile -FILE: ../../../flutter/ci/docker/build/engine_gclient FILE: ../../../flutter/lib/io/dart_io.cc FILE: ../../../flutter/lib/io/dart_io.h FILE: ../../../flutter/lib/snapshot/libraries.json diff --git a/travis/licenses_golden/licenses_garnet b/ci/licenses_golden/licenses_garnet similarity index 100% rename from travis/licenses_golden/licenses_garnet rename to ci/licenses_golden/licenses_garnet diff --git a/travis/licenses_golden/licenses_lib b/ci/licenses_golden/licenses_lib similarity index 100% rename from travis/licenses_golden/licenses_lib rename to ci/licenses_golden/licenses_lib diff --git a/travis/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia similarity index 100% rename from travis/licenses_golden/licenses_skia rename to ci/licenses_golden/licenses_skia diff --git a/travis/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party similarity index 100% rename from travis/licenses_golden/licenses_third_party rename to ci/licenses_golden/licenses_third_party diff --git a/travis/test.sh b/ci/test.sh similarity index 100% rename from travis/test.sh rename to ci/test.sh diff --git a/testing/run_tests.sh b/testing/run_tests.sh index 26e9401d43d91..7baf91d29b711 100755 --- a/testing/run_tests.sh +++ b/testing/run_tests.sh @@ -5,7 +5,7 @@ set -ex out/host_debug_unopt/fxl_unittests out/host_debug_unopt/synchronization_unittests -flutter/travis/analyze.sh +flutter/ci/analyze.sh pushd flutter/testing/dart pub get @@ -20,5 +20,5 @@ for TEST_SCRIPT in flutter/testing/dart/*.dart; do done pushd flutter -travis/test.sh +ci/test.sh popd diff --git a/tools/licenses/README.md b/tools/licenses/README.md index 15734c73c4804..f60cdd5f7fc12 100644 --- a/tools/licenses/README.md +++ b/tools/licenses/README.md @@ -4,10 +4,10 @@ To update the golden license files, make sure you've rebased your branch to the pub get gclient sync rm -rf ../../../out/licenses -dart lib/main.dart --src ../../.. --out ../../../out/licenses --golden ../../travis/licenses_golden +dart lib/main.dart --src ../../.. --out ../../../out/licenses --golden ../../ci/licenses_golden ``` -Then copy any affected files from `../../../out/licenses` to `../../travis/licenses_golden` and add them to your change. +Then copy any affected files from `../../../out/licenses` to `../../ci/licenses_golden` and add them to your change. The `sky/packages/sky_engine/LICENSE` file is included in product releases and should be updated any time the golden file changes in a way that involves changes to anything other than the FILE lines. To update this file, run: diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index f9e95dc891bc4..12db6b5595076 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -54,7 +54,7 @@ abstract class RepositoryLicensedFile extends RepositoryFile { static final RegExp _readmeNamePattern = new RegExp(r'\b_*(?:readme|contributing|patents)_*\b', caseSensitive: false); static final RegExp _buildTimePattern = new RegExp(r'^(?!.*gen$)(?:CMakeLists\.txt|(?:pkgdata)?Makefile(?:\.inc)?(?:\.am|\.in|)|configure(?:\.ac|\.in)?|config\.(?:sub|guess)|.+\.m4|install-sh|.+\.sh|.+\.bat|.+\.pyc?|.+\.pl|icu-configure|.+\.gypi?|.*\.gni?|.+\.mk|.+\.cmake|.+\.gradle|.+\.yaml|pubspec\.lock|\.packages|vms_make\.com|pom\.xml|\.project|source\.properties)$', caseSensitive: false); static final RegExp _docsPattern = new RegExp(r'^(?:INSTALL|NEWS|OWNERS|AUTHORS|ChangeLog(?:\.rst|\.[0-9]+)?|.+\.txt|.+\.md|.+\.log|.+\.css|.+\.1|doxygen\.config|.+\.spec(?:\.in)?)$', caseSensitive: false); - static final RegExp _devPattern = new RegExp(r'^(?:codereview\.settings|.+\.~|.+\.~[0-9]+~|\.clang-format|\.gitattributes|\.landmines|\.DS_Store|\.travis\.yml)$', caseSensitive: false); + static final RegExp _devPattern = new RegExp(r'^(?:codereview\.settings|.+\.~|.+\.~[0-9]+~|\.clang-format|\.gitattributes|\.landmines|\.DS_Store|\.travis\.yml|\.cirrus\.yml)$', caseSensitive: false); static final RegExp _testsPattern = new RegExp(r'^(?:tj(?:bench|example)test\.(?:java\.)?in|example\.c)$', caseSensitive: false); bool get isIncludedInBuildProducts { @@ -2211,7 +2211,7 @@ class RepositoryFlutterDirectory extends RepositoryDirectory { && entry.name != 'docs' && entry.name != 'examples' && entry.name != 'build' - && entry.name != 'travis' + && entry.name != 'ci' && entry.name != 'frontend_server' && super.shouldRecurse(entry); } diff --git a/travis/gclient b/travis/gclient deleted file mode 100644 index 030049953eaa0..0000000000000 --- a/travis/gclient +++ /dev/null @@ -1,9 +0,0 @@ -solutions = [{ - "name" : "src/flutter", - "url" : "https://github.com/flutter/engine.git", - "deps_file" : "DEPS", - "managed" : False, - "safesync_url": "", -}] - -target_os = ["android"] diff --git a/travis/setup.sh b/travis/setup.sh deleted file mode 100755 index eec7742da6232..0000000000000 --- a/travis/setup.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -ex - -(cd; git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git) - -PATH="$HOME/depot_tools:$PATH" - -cd .. -mv engine flutter -mkdir src -mv flutter src -cd src - -mv flutter/travis/gclient ../.gclient -gclient sync