diff --git a/app_dart/lib/src/service/config.dart b/app_dart/lib/src/service/config.dart index 0a73a310c..99494f7da 100644 --- a/app_dart/lib/src/service/config.dart +++ b/app_dart/lib/src/service/config.dart @@ -417,7 +417,6 @@ interface class Config extends DynamicallyUpdatedConfig { /// These accounts should not need reviews before merging. See /// https://github.com/flutter/flutter/blob/master/docs/infra/Autorollers.md Set get rollerAccounts => const { - 'skia-flutter-autoroll', 'engine-flutter-autoroll', 'dependabot', 'dependabot[bot]', diff --git a/app_dart/lib/src/service/pull_request_manager.dart b/app_dart/lib/src/service/pull_request_manager.dart index 6242cf619..a509d6c18 100644 --- a/app_dart/lib/src/service/pull_request_manager.dart +++ b/app_dart/lib/src/service/pull_request_manager.dart @@ -559,10 +559,6 @@ class PullRequestManager { List files, RepositorySlug slug, ) async { - if (pr.user!.login == 'engine-flutter-autoroll') { - return false; - } - final labels = {}; var hasTests = false; var needsTests = false; @@ -684,11 +680,6 @@ class PullRequestManager { List files, RepositorySlug slug, ) async { - // Do not apply the test labels for the autoroller accounts. - if (pr.user!.login == 'skia-flutter-autoroll') { - return false; - } - var hasTests = false; var needsTests = false; diff --git a/app_dart/test/request_handlers/github/webhook_subscription_test.dart b/app_dart/test/request_handlers/github/webhook_subscription_test.dart index 5b0a6c657..8d65ba2c3 100644 --- a/app_dart/test/request_handlers/github/webhook_subscription_test.dart +++ b/app_dart/test/request_handlers/github/webhook_subscription_test.dart @@ -86,7 +86,6 @@ void main() { missingTestsPullRequestMessageValue: 'missingTestPullRequestMessage', releaseBranchPullRequestMessageValue: 'releaseBranchPullRequestMessage', rollerAccountsValue: const { - 'skia-flutter-autoroll', 'engine-flutter-autoroll', 'dependabot', 'dependabot[bot]', @@ -900,7 +899,6 @@ void main() { 'Auto-roller accounts label Framework PR with CICD label, but no comment', () { final inputs = { - 'skia-flutter-autoroll', 'dependabot', 'engine-flutter-autoroll', 'flutter-pub-roller-bot', @@ -1803,48 +1801,6 @@ void foo() { }, ); - test( - 'Engine does not label PR for no tests if author is skia-flutter-autoroll', - () async { - const issueNumber = 123; - - tester.message = generateGithubWebhookMessage( - action: 'opened', - number: issueNumber, - slug: Config.flutterSlug, - login: 'skia-flutter-autoroll', - ); - - when( - pullRequestsService.listFiles(Config.flutterSlug, issueNumber), - ).thenAnswer( - (_) => Stream.value( - PullRequestFile() - ..filename = - 'engine/src/flutter/shell/platform/darwin/ios/framework/Source/boost.mm', - ), - ); - - when( - issuesService.listCommentsByIssue(Config.flutterSlug, issueNumber), - ).thenAnswer( - (_) => Stream.value( - IssueComment()..body = 'some other comment', - ), - ); - - await tester.post(webhook); - - verifyNever( - issuesService.createComment( - Config.flutterSlug, - issueNumber, - argThat(contains(config.missingTestsPullRequestMessageValue)), - ), - ); - }, - ); - test('Engine labels PRs, no comment if DEPS-only', () async { const issueNumber = 123; diff --git a/auto_submit/lib/service/config.dart b/auto_submit/lib/service/config.dart index 85df5aabf..81828b5cb 100644 --- a/auto_submit/lib/service/config.dart +++ b/auto_submit/lib/service/config.dart @@ -98,13 +98,11 @@ class Config { /// These accounts should not need reviews before merging. See /// https://github.com/flutter/flutter/blob/master/docs/infra/Autorollers.md Set get rollerAccounts => const { - 'skia-flutter-autoroll', 'engine-flutter-autoroll', // REST API returns dependabot[bot] as author while GraphQL returns dependabot. We need // both as we use graphQL to merge the PR and REST API to approve the PR. 'dependabot[bot]', 'dependabot', - 'DartDevtoolWorkflowBot', 'flutter-pub-roller-bot', }; diff --git a/auto_submit/test/configuration/repository_configuration_data.dart b/auto_submit/test/configuration/repository_configuration_data.dart index 97bb74483..eed867923 100644 --- a/auto_submit/test/configuration/repository_configuration_data.dart +++ b/auto_submit/test/configuration/repository_configuration_data.dart @@ -8,7 +8,6 @@ const String sampleConfigNoOverride = ''' auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true @@ -20,7 +19,6 @@ const String sampleConfigWithOverride = ''' auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true diff --git a/auto_submit/test/configuration/repository_configuration_manager_test.dart b/auto_submit/test/configuration/repository_configuration_manager_test.dart index 1f41539cf..9589296d7 100644 --- a/auto_submit/test/configuration/repository_configuration_manager_test.dart +++ b/auto_submit/test/configuration/repository_configuration_manager_test.dart @@ -41,7 +41,6 @@ void main() { auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true @@ -57,7 +56,7 @@ void main() { expect(repositoryConfiguration.allowConfigOverride, isFalse); expect(repositoryConfiguration.defaultBranch, 'main'); expect(repositoryConfiguration.autoApprovalAccounts.isNotEmpty, isTrue); - expect(repositoryConfiguration.autoApprovalAccounts.length, 3); + expect(repositoryConfiguration.autoApprovalAccounts.length, 2); expect(repositoryConfiguration.approvingReviews, 2); expect(repositoryConfiguration.approvalGroup, 'flutter-hackers'); expect(repositoryConfiguration.runCi, isTrue); @@ -90,7 +89,6 @@ void main() { auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true @@ -103,7 +101,7 @@ void main() { expect(repositoryConfiguration.allowConfigOverride, isFalse); expect(repositoryConfiguration.defaultBranch, 'main'); expect(repositoryConfiguration.autoApprovalAccounts.isNotEmpty, isTrue); - expect(repositoryConfiguration.autoApprovalAccounts.length, 3); + expect(repositoryConfiguration.autoApprovalAccounts.length, 2); expect(repositoryConfiguration.approvingReviews, 2); expect(repositoryConfiguration.approvalGroup, 'flutter-hackers'); expect(repositoryConfiguration.runCi, isTrue); @@ -115,7 +113,6 @@ void main() { auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true @@ -129,7 +126,7 @@ void main() { expect(repositoryConfiguration.allowConfigOverride, isFalse); expect(repositoryConfiguration.defaultBranch, 'master'); expect(repositoryConfiguration.autoApprovalAccounts.isNotEmpty, isTrue); - expect(repositoryConfiguration.autoApprovalAccounts.length, 3); + expect(repositoryConfiguration.autoApprovalAccounts.length, 2); expect(repositoryConfiguration.approvingReviews, 2); expect(repositoryConfiguration.approvalGroup, 'flutter-hackers'); expect(repositoryConfiguration.runCi, isTrue); @@ -141,7 +138,6 @@ void main() { auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true @@ -158,7 +154,7 @@ void main() { expect(repositoryConfiguration.allowConfigOverride, isFalse); expect(repositoryConfiguration.defaultBranch, 'main'); expect(repositoryConfiguration.autoApprovalAccounts.isNotEmpty, isTrue); - expect(repositoryConfiguration.autoApprovalAccounts.length, 3); + expect(repositoryConfiguration.autoApprovalAccounts.length, 2); expect(repositoryConfiguration.approvingReviews, 2); expect(repositoryConfiguration.approvalGroup, 'flutter-hackers'); expect(repositoryConfiguration.runCi, isTrue); @@ -190,7 +186,6 @@ void main() { auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true @@ -211,7 +206,7 @@ void main() { ); expect(mergedRepositoryConfiguration.defaultBranch, 'main'); expect(mergedRepositoryConfiguration.allowConfigOverride, isTrue); - expect(mergedRepositoryConfiguration.autoApprovalAccounts.length, 3); + expect(mergedRepositoryConfiguration.autoApprovalAccounts.length, 2); expect( mergedRepositoryConfiguration.autoApprovalAccounts.contains( 'dependabot[bot]', @@ -224,12 +219,6 @@ void main() { ), isTrue, ); - expect( - mergedRepositoryConfiguration.autoApprovalAccounts.contains( - 'DartDevtoolWorkflowBot', - ), - isTrue, - ); expect(mergedRepositoryConfiguration.approvingReviews, 2); expect(mergedRepositoryConfiguration.runCi, isTrue); expect( @@ -266,7 +255,7 @@ void main() { globalRepositoryConfiguration, localRepositoryConfiguration, ); - expect(mergedRepositoryConfiguration.autoApprovalAccounts.length, 4); + expect(mergedRepositoryConfiguration.autoApprovalAccounts.length, 3); expect( mergedRepositoryConfiguration.autoApprovalAccounts.contains( 'dependabot[bot]', @@ -279,12 +268,6 @@ void main() { ), isTrue, ); - expect( - mergedRepositoryConfiguration.autoApprovalAccounts.contains( - 'DartDevtoolWorkflowBot', - ), - isTrue, - ); expect( mergedRepositoryConfiguration.autoApprovalAccounts.contains( expectedAddedApprovalAccount, @@ -294,7 +277,7 @@ void main() { }); test('Duplicate auto approval account is not added', () { - const expectedAddedApprovalAccount = 'DartDevtoolWorkflowBot'; + const expectedAddedApprovalAccount = 'dependabot'; const localAutoApprovalAccounts = {expectedAddedApprovalAccount}; final localRepositoryConfiguration = RepositoryConfiguration( autoApprovalAccounts: localAutoApprovalAccounts, @@ -307,7 +290,7 @@ void main() { globalRepositoryConfiguration, localRepositoryConfiguration, ); - expect(mergedRepositoryConfiguration.autoApprovalAccounts.length, 3); + expect(mergedRepositoryConfiguration.autoApprovalAccounts.length, 2); expect( mergedRepositoryConfiguration.autoApprovalAccounts.contains( 'dependabot[bot]', @@ -320,12 +303,6 @@ void main() { ), isTrue, ); - expect( - mergedRepositoryConfiguration.autoApprovalAccounts.contains( - 'DartDevtoolWorkflowBot', - ), - isTrue, - ); }); test('Approving reviews is overridden by local config', () { diff --git a/auto_submit/test/configuration/repository_configuration_test.dart b/auto_submit/test/configuration/repository_configuration_test.dart index 3e97aa388..0db124a9a 100644 --- a/auto_submit/test/configuration/repository_configuration_test.dart +++ b/auto_submit/test/configuration/repository_configuration_test.dart @@ -15,7 +15,6 @@ void main() { auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: flutter-hackers run_ci: true diff --git a/auto_submit/test/src/service/fake_config.dart b/auto_submit/test/src/service/fake_config.dart index 4bcc32049..ada184d4a 100644 --- a/auto_submit/test/src/service/fake_config.dart +++ b/auto_submit/test/src/service/fake_config.dart @@ -66,7 +66,6 @@ class FakeConfig extends Config { Set get rollerAccounts => rollerAccountsValue ?? const { - 'skia-flutter-autoroll', 'engine-flutter-autoroll', 'dependabot[bot]', 'dependabot', diff --git a/auto_submit/test/validations/approval_test.dart b/auto_submit/test/validations/approval_test.dart index dd89ce435..0342ffaa3 100644 --- a/auto_submit/test/validations/approval_test.dart +++ b/auto_submit/test/validations/approval_test.dart @@ -512,7 +512,6 @@ void main() { auto_approval_accounts: - dependabot[bot] - dependabot - - DartDevtoolWorkflowBot approving_reviews: 2 approval_group: custom-group run_ci: true diff --git a/auto_submit/test/validations/ci_successful_test.dart b/auto_submit/test/validations/ci_successful_test.dart index f6af0c220..20d577529 100644 --- a/auto_submit/test/validations/ci_successful_test.dart +++ b/auto_submit/test/validations/ci_successful_test.dart @@ -458,7 +458,7 @@ void main() { repositoryStatusesWithGoldMock, ); const allSuccess = true; - final author = Author(login: 'skia-flutter-autoroll'); + final author = Author(login: 'engine-flutter-autoroll'); slug = github.RepositorySlug('flutter', 'flutter'); final labelNames = []; @@ -491,7 +491,7 @@ void main() { repositoryStatusesWithFailedGoldMock, ); const allSuccess = true; - final author = Author(login: 'skia-flutter-autoroll'); + final author = Author(login: 'engine-flutter-autoroll'); slug = github.RepositorySlug('flutter', 'flutter'); final labelNames = [];