Skip to content

Do not cleanup Gradle in non-Android integration tests - #66487

Merged
jmagman merged 1 commit into
flutter:masterfrom
jmagman:gradle-no-cleanup
Sep 25, 2020
Merged

jmagman merged 1 commit into
flutter:masterfrom
jmagman:gradle-no-cleanup

Conversation

@jmagman

@jmagman jmagman commented Sep 23, 2020

Copy link
Copy Markdown
Member

Description

When I run iOS tests locally, I always see Gradle get downloaded when the test is over:

stdout: • No issues found!
"/Users/m/Projects/flutter/bin/flutter" exit code: 0

Telling Gradle to shut down (JAVA_HOME=/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home)

Executing: chmod a+x /var/folders/bx/pyplw7v92lj58gm3_lztz5sc00mfq2/T/flutter_devicelab_shutdown_gradle.whHIvX/gradlew in /Users/m/Projects/flutter/dev/devicelab
"chmod" exit code: 0

Executing: /var/folders/bx/pyplw7v92lj58gm3_lztz5sc00mfq2/T/flutter_devicelab_shutdown_gradle.whHIvX/gradlew --stop in /var/folders/bx/pyplw7v92lj58gm3_lztz5sc00mfq2/T/flutter_devicelab_shutdown_gradle.whHIvX with environment {JAVA_HOME: /Applications/Android Studio.app/Contents/jre/jdk/Contents/Home}
stdout: Downloading https://services.gradle.org/distributions/gradle-5.6.2-all.zip
stdout: ...........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Instead, let's only do that cleanup if the test is for Android. I don't think this is actually happening in the devicelab because JAVA_HOME isn't set up on the iOS host agents.

@jmagman jmagman added the c: contributor-productivity Team-specific productivity, code health, technical debt. label Sep 23, 2020
@jmagman
jmagman requested a review from blasten September 23, 2020 21:00
@jmagman jmagman self-assigned this Sep 23, 2020
@flutter-dashboard

Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
if (!Platform.isWindows) {
if (deviceOperatingSystem == null || deviceOperatingSystem == DeviceOperatingSystem.android) {

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is the only change other than the import. The rest is whitespace.

@jonahwilliams jonahwilliams left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!

@blasten blasten left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM

@jmagman
jmagman merged commit a6a8a14 into flutter:master Sep 25, 2020
@jmagman
jmagman deleted the gradle-no-cleanup branch September 25, 2020 01:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants