Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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)_

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions travis/build.sh → ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions travis/licenses.sh → ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions testing/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,5 +20,5 @@ for TEST_SCRIPT in flutter/testing/dart/*.dart; do
done

pushd flutter
travis/test.sh
ci/test.sh
popd
4 changes: 2 additions & 2 deletions tools/licenses/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions tools/licenses/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could remove travis.yml from this now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not yet. Although we don't have travis.yml, plenty of third party libs still have travis.yml and we don't want them to be in our licenses golden.

static final RegExp _testsPattern = new RegExp(r'^(?:tj(?:bench|example)test\.(?:java\.)?in|example\.c)$', caseSensitive: false);

bool get isIncludedInBuildProducts {
Expand Down Expand Up @@ -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);
}
Expand Down
9 changes: 0 additions & 9 deletions travis/gclient

This file was deleted.

15 changes: 0 additions & 15 deletions travis/setup.sh

This file was deleted.