Skip to content

Commit c381e7e

Browse files
auto-submit[bot]auto-submit[bot]
authored andcommitted
Reverts "add run_gradle_lock_files_check.dart for new PR's that modify gradle files (flutter#169245)" (flutter#170770)
<!-- start_original_pr_link --> Reverts: flutter#169245 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: matanlurey <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: Increased the time of the test task `gradle_java8_compile_test` from about 5 minutes per run to over 30m, which hits the timeout causing tree failures. https://ci.chromium.org/ui/p/flutter/builders/luci.flutter.prod/Linux%20gradle_java8_compile_test <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: ash2moon <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {matanlurey} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: This commit checks if there have been any changes to the gradle files and if gradle lock files need updating. If so, it will alert then PR owner to update their PR with the new gradle lock file.s Fixes flutter#163228 Example test run: https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8712427303492230593/+/u/run_gradle_java8_compile_test/stdout?format=raw This was added as an existing test under Linux gradle_java8_compile_test because benchmarking results showed on average about 3min 30s to run on my local M2 Mac. SInce it is not > 10min to run, placing it inside an existing test case was ideal. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent 0b5ebca commit c381e7e

File tree

5 files changed

+0
-526
lines changed

5 files changed

+0
-526
lines changed

.ci.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -909,10 +909,6 @@ targets:
909909
- .ci.yaml
910910
- engine/**
911911
- DEPS
912-
- /**/*.gradle
913-
- /**/*.gradle.kts
914-
- /**/gradle-wrapper.properties
915-
- /**/*.lockfile
916912

917913
- name: Linux gradle_plugin_bundle_test
918914
recipe: devicelab/devicelab_drone

dev/devicelab/bin/tasks/gradle_java8_compile_test.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,11 @@ import 'package:flutter_devicelab/framework/apk_utils.dart';
88
import 'package:flutter_devicelab/framework/framework.dart';
99
import 'package:flutter_devicelab/framework/task_result.dart';
1010
import 'package:flutter_devicelab/framework/utils.dart';
11-
import 'package:flutter_devicelab/tasks/gradle_lock_files_check.dart';
1211
import 'package:path/path.dart' as path;
1312

1413
Future<void> main() async {
1514
await task(() async {
1615
try {
17-
section('Gradle lockfiles check');
18-
try {
19-
await runGradleLockFilesCheck();
20-
} catch (e) {
21-
return TaskResult.failure(e.toString());
22-
}
23-
2416
await runPluginProjectTest((FlutterPluginProject pluginProject) async {
2517
section('check main plugin file exists');
2618
final File pluginMainKotlinFile = File(

dev/devicelab/lib/framework/utils.dart

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -324,18 +324,6 @@ Future<void> forceQuitRunningProcesses() async {
324324
_runningProcesses.clear();
325325
}
326326

327-
/// Type definition of the [exec] function.
328-
typedef ExecFunction =
329-
Future<int> Function(
330-
String executable,
331-
List<String> arguments, {
332-
Map<String, String>? environment,
333-
bool canFail,
334-
String? workingDirectory,
335-
StringBuffer? output,
336-
StringBuffer? stderr,
337-
});
338-
339327
/// Executes a command and returns its exit code.
340328
Future<int> exec(
341329
String executable,
@@ -436,20 +424,6 @@ Future<void> forwardStandardStreams(
436424
return Future.wait<void>(<Future<void>>[stdoutDone.future, stderrDone.future]);
437425
}
438426

439-
/// Type definition of the [eval] function.
440-
typedef EvalFunction =
441-
Future<String> Function(
442-
String executable,
443-
List<String> arguments, {
444-
Map<String, String>? environment,
445-
bool canFail,
446-
String? workingDirectory,
447-
StringBuffer? stdout,
448-
StringBuffer? stderr,
449-
bool printStdout,
450-
bool printStderr,
451-
});
452-
453427
/// Executes a command and returns its standard output as a String.
454428
///
455429
/// For logging purposes, the command's output is also printed out by default.

dev/devicelab/lib/tasks/gradle_lock_files_check.dart

Lines changed: 0 additions & 133 deletions
This file was deleted.

0 commit comments

Comments
 (0)